On Mon, 27 Feb 2012 11:26:25 +0100, Pascal Stumpf wrote: > On Mon, 20 Feb 2012 23:26:19 +0100, Pascal Stumpf wrote: > > Simple patch taken from base ... > > ping >
Update to 7.4, including aforementioned patch, and take maintainer. Index: Makefile =================================================================== RCS file: /cvs/ports/devel/gdb/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile 22 Dec 2011 20:27:31 -0000 1.19 +++ Makefile 29 Feb 2012 10:19:20 -0000 @@ -3,25 +3,24 @@ COMMENT= GNU debugger CATEGORIES= devel -DISTNAME= gdb-7.2 -REVISION= 7 +DISTNAME= gdb-7.4 HOMEPAGE= http://www.gnu.org/software/gdb/ +MAINTAINER= Pascal Stumpf <[email protected]> + # GPLv2 and GPLv3 PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes -MASTER_SITES= ${MASTER_SITE_GNU:=gdb/} \ - http://distfiles.nl/ +MASTER_SITES= ${MASTER_SITE_GNU:=gdb/} DIST_SUBDIR= gdb MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/gdb -WANTLIB += c kvm m ncurses z - +WANTLIB = c expat kvm m ncurses pthread ${MODPY_WANTLIB} util z #SEPARATE_BUILD = Yes CONFIGURE_STYLE=gnu @@ -32,12 +31,9 @@ CONFIGURE_ARGS= --program-transform-name USE_GMAKE= Yes +USE_LIBTOOL = Yes MODULES += lang/python -WANTLIB += expat ${MODPY_WANTLIB} pthread util LIB_DEPENDS += ${MODPY_LIB_DEPENDS} MODPY_BUILDDEP = No - -post-extract: - perl -pi -e 's/\014//g' ${WRKSRC}/gdb/amd64obsd-tdep.c .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/devel/gdb/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 11 Nov 2011 18:33:03 -0000 1.4 +++ distinfo 29 Feb 2012 10:19:20 -0000 @@ -1,5 +1,5 @@ -MD5 (gdb/gdb-7.2.tar.gz) = lQt2ZGa+50jlVHZchri0lQ== -RMD160 (gdb/gdb-7.2.tar.gz) = 7vJVe8vJrgnGTSFUZ75opTr+alY= -SHA1 (gdb/gdb-7.2.tar.gz) = 98/2U1iw8HThGOxMhI6CtAf7+LM= -SHA256 (gdb/gdb-7.2.tar.gz) = NJGctRM0yBSa427QhvNeef4/orKoW1aNfA7a0gzZctQ= -SIZE (gdb/gdb-7.2.tar.gz) = 24678132 +MD5 (gdb/gdb-7.4.tar.gz) = eHeHXIr3x+99BtMprJYdPw== +RMD160 (gdb/gdb-7.4.tar.gz) = 61QmouT8ZC2c4YFikzxJBlmeytE= +SHA1 (gdb/gdb-7.4.tar.gz) = MBtjGkYdqYsjuou153bGa5iqkjk= +SHA256 (gdb/gdb-7.4.tar.gz) = 4sGOL0pf6riXWVRVo9Yjzru6np3S2+mlUQ7XrUOuAdI= +SIZE (gdb/gdb-7.4.tar.gz) = 27352504 Index: patches/patch-bfd_elf_c =================================================================== RCS file: patches/patch-bfd_elf_c diff -N patches/patch-bfd_elf_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-bfd_elf_c 29 Feb 2012 10:19:20 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ +--- bfd/elf.c.orig Tue Dec 6 15:09:09 2011 ++++ bfd/elf.c Wed Feb 29 00:06:19 2012 +@@ -8641,6 +8641,11 @@ elfcore_grok_openbsd_procinfo (bfd *abfd, Elf_Internal + static bfd_boolean + elfcore_grok_openbsd_note (bfd *abfd, Elf_Internal_Note *note) + { ++ int lwp; ++ ++ if (elfcore_netbsd_get_lwpid (note, &lwp)) ++ elf_tdata (abfd)->core_lwpid = lwp; ++ + if (note->type == NT_OPENBSD_PROCINFO) + return elfcore_grok_openbsd_procinfo (abfd, note); + Index: patches/patch-etc_Makefile_in =================================================================== RCS file: /cvs/ports/devel/gdb/patches/patch-etc_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-etc_Makefile_in --- patches/patch-etc_Makefile_in 8 Nov 2011 20:23:00 -0000 1.1 +++ patches/patch-etc_Makefile_in 29 Feb 2012 10:19:20 -0000 @@ -2,14 +2,14 @@ $OpenBSD: patch-etc_Makefile_in,v 1.1 20 Don't bother installing GNU coding standards info. ---- etc/Makefile.in.orig Tue Nov 8 21:12:15 2011 -+++ etc/Makefile.in Tue Nov 8 21:12:28 2011 +--- etc/Makefile.in.orig Sat Nov 20 20:37:57 2010 ++++ etc/Makefile.in Wed Feb 29 00:09:58 2012 @@ -64,7 +64,7 @@ PDFFILES = standards.pdf configure.pdf HTMLFILES = standards.html configure.html all: info --install: install-info -+install: +-install install-strip: install-info ++install install-strip: uninstall: Index: patches/patch-gdb_amd64obsd-tdep_c =================================================================== RCS file: patches/patch-gdb_amd64obsd-tdep_c diff -N patches/patch-gdb_amd64obsd-tdep_c --- patches/patch-gdb_amd64obsd-tdep_c 22 Dec 2011 20:27:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,38 +0,0 @@ -$OpenBSD: patch-gdb_amd64obsd-tdep_c,v 1.1 2011/12/22 20:27:32 pascal Exp $ ---- gdb/amd64obsd-tdep.c.orig Thu Dec 22 18:17:24 2011 -+++ gdb/amd64obsd-tdep.c Thu Dec 22 18:17:24 2011 -@@ -456,9 +456,6 @@ amd64obsd_init_abi (struct gdbarch_info info, struct g - tdep->gregset_num_regs = ARRAY_SIZE (amd64obsd_r_reg_offset); - tdep->sizeof_gregset = 24 * 8; - -- set_gdbarch_regset_from_core_section (gdbarch, -- amd64obsd_regset_from_core_section); -- - tdep->jb_pc_offset = 7 * 8; - - tdep->sigtramp_p = amd64obsd_sigtramp_p; -@@ -479,6 +476,17 @@ amd64obsd_init_abi (struct gdbarch_info info, struct g - } - - -+/* Traditional (a.out) NetBSD-style core dumps. */ -+ -+static void -+amd64obsd_core_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) -+{ -+ amd64obsd_init_abi (info, gdbarch); -+ -+ set_gdbarch_regset_from_core_section -+ (gdbarch, amd64obsd_regset_from_core_section); -+} -+ - /* Provide a prototype to silence -Wmissing-prototypes. */ - void _initialize_amd64obsd_tdep (void); - -@@ -493,5 +501,5 @@ _initialize_amd64obsd_tdep (void) - - /* OpenBSD uses traditional (a.out) NetBSD-style core dumps. */ - gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, -- GDB_OSABI_NETBSD_AOUT, amd64obsd_init_abi); -+ GDB_OSABI_NETBSD_AOUT, amd64obsd_core_init_abi); - } Index: patches/patch-gdb_data-directory_Makefile_in =================================================================== RCS file: patches/patch-gdb_data-directory_Makefile_in diff -N patches/patch-gdb_data-directory_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gdb_data-directory_Makefile_in 29 Feb 2012 10:19:20 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- gdb/data-directory/Makefile.in.orig Fri Jan 6 05:43:34 2012 ++++ gdb/data-directory/Makefile.in Wed Feb 29 00:35:12 2012 +@@ -93,7 +93,7 @@ FLAGS_TO_PASS = \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" + + .PHONY: all +-all: stamp-syscalls stamp-python ++all: + + # For portability's sake, we need to handle systems that don't have + # symbolic links. +@@ -187,7 +187,7 @@ install: all + @$(MAKE) $(FLAGS_TO_PASS) install-only + + .PHONY: install-only +-install-only: install-syscalls install-python ++install-only: + + .PHONY: uninstall + uninstall: uninstall-syscalls uninstall-python Index: patches/patch-gdb_python_python-config_py =================================================================== RCS file: /cvs/ports/devel/gdb/patches/patch-gdb_python_python-config_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-gdb_python_python-config_py --- patches/patch-gdb_python_python-config_py 13 Nov 2011 14:56:57 -0000 1.1 +++ patches/patch-gdb_python_python-config_py 29 Feb 2012 10:19:20 -0000 @@ -1,11 +1,12 @@ $OpenBSD: patch-gdb_python_python-config_py,v 1.1 2011/11/13 14:56:57 espie Exp $ ---- gdb/python/python-config.py.orig Thu May 27 03:36:22 2010 -+++ gdb/python/python-config.py Sat Nov 12 23:43:37 2011 -@@ -50,5 +50,7 @@ elif opt in ('--libs', '--ldflags'): - # shared library in prefix/lib/. - if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'): - libs.insert(0, '-L' + getvar('LIBPL')) -+ if opt == '--ldflags': -+ libs.insert(0, getvar('LDFLAGS')) - print ' '.join(libs) - +--- gdb/python/python-config.py.orig Mon Jan 31 05:42:08 2011 ++++ gdb/python/python-config.py Wed Feb 29 00:21:30 2012 +@@ -71,6 +71,8 @@ for opt in opt_flags: + libs.insert(0, '-L' + getvar('LIBPL')) + elif os.name == 'nt': + libs.insert(0, '-L' + sysconfig.PREFIX + '/libs') ++ if getvar('LDFLAGS') is not None: ++ libs.insert(0, getvar('LDFLAGS')) + if getvar('LINKFORSHARED') is not None: + libs.extend(getvar('LINKFORSHARED').split()) + print to_unix_path(' '.join(libs)) Index: patches/patch-libiberty_Makefile_in =================================================================== RCS file: /cvs/ports/devel/gdb/patches/patch-libiberty_Makefile_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-libiberty_Makefile_in --- patches/patch-libiberty_Makefile_in 11 Nov 2011 23:01:23 -0000 1.1 +++ patches/patch-libiberty_Makefile_in 29 Feb 2012 10:19:20 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-libiberty_Makefile_in,v 1.1 2011/11/11 23:01:23 jasper Exp $ ---- libiberty/Makefile.in.orig Fri Nov 11 23:57:19 2011 -+++ libiberty/Makefile.in Fri Nov 11 23:57:30 2011 -@@ -321,7 +321,7 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC) +--- libiberty/Makefile.in.orig Wed Nov 2 23:02:55 2011 ++++ libiberty/Makefile.in Wed Feb 29 00:15:13 2012 +@@ -342,7 +342,7 @@ libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC) @MAINT@ echo stamp > stamp-functions INSTALL_DEST = @INSTALL_DEST@ -install: install_to_$(INSTALL_DEST) install-subdir +install: + install-strip: install - # This is tricky. Even though CC in the Makefile contains - # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the + .PHONY: install install-strip Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/gdb/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- pkg/PLIST 11 Nov 2011 23:01:23 -0000 1.9 +++ pkg/PLIST 29 Feb 2012 10:19:20 -0000 @@ -6,6 +6,8 @@ include/ansidecl.h include/bfd.h include/bfdlink.h include/dis-asm.h +include/gdb/ +include/gdb/jit-reader.h include/symcat.h @info info/annotate.info @info info/bfd.info @@ -18,3 +20,6 @@ lib/libopcodes.a lib/libopcodes.la @man man/man1/egdb.1 @man man/man1/egdbtui.1 +@comment share/gdb/ +@comment share/gdb/python/ +@comment share/gdb/python/gdb/
