diff options
author | joerg <joerg@pkgsrc.org> | 2006-03-14 00:47:50 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-03-14 00:47:50 +0000 |
commit | a5f3be85943d18a0266b89d72ffdb8aec3d4a49b (patch) | |
tree | 8e4ff9ca054fe188a379cb70cd7a389aa73f2e95 /devel/gdb6 | |
parent | 5610097770f20136b2cdf44e5ea0bcc5a1b0c2c3 (diff) | |
download | pkgsrc-a5f3be85943d18a0266b89d72ffdb8aec3d4a49b.tar.gz |
Add DragonFly support. Hack around gettext brokeness. Since it is
easier to patch the output of autoconf, also create gdb/configure
with the changes from configure.in directly, removing the build
dependency on autoconf.
Diffstat (limited to 'devel/gdb6')
-rw-r--r-- | devel/gdb6/Makefile | 7 | ||||
-rw-r--r-- | devel/gdb6/distinfo | 13 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-aa | 27 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-ad | 18 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-bf | 13 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-bg | 50 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-bh | 12 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-bi | 13 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-bj | 67 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-bk | 25 | ||||
-rw-r--r-- | devel/gdb6/patches/patch-bl | 13 |
11 files changed, 241 insertions, 17 deletions
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile index e504467f6bc..e3b76d69048 100644 --- a/devel/gdb6/Makefile +++ b/devel/gdb6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/03/05 16:27:24 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/03/14 00:47:50 joerg Exp $ # DISTNAME= gdb-6.2.1 @@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= Darwin-*-* BUILD_USES_MSGFMT= yes -USE_TOOLS+= autoconf213 gmake makeinfo +USE_TOOLS+= gmake makeinfo USE_LIBTOOL= yes LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= yes @@ -33,9 +33,6 @@ INFO_FILES+= stabs.info standards.info pre-patch: ${CP} ${FILESDIR}/nbsd-nat.c ${WRKSRC}/gdb -pre-configure: - cd ${WRKSRC}/gdb; autoheader; autoconf - do-test: if ${PKG_INFO} -qe dejagnu; then \ (cd ${WRKSRC} && ${GMAKE} check); \ diff --git a/devel/gdb6/distinfo b/devel/gdb6/distinfo index d7e142d511a..09543e32fe1 100644 --- a/devel/gdb6/distinfo +++ b/devel/gdb6/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.7 2005/10/20 17:48:49 wiz Exp $ +$NetBSD: distinfo,v 1.8 2006/03/14 00:47:50 joerg Exp $ SHA1 (gdb-6.2.1.tar.bz2) = 50cee3887744c4140aafcc0e4eb579d94464dfd7 RMD160 (gdb-6.2.1.tar.bz2) = 6fe9f3bbef076c55cbcdf05143e7d5f98f61f889 Size (gdb-6.2.1.tar.bz2) = 12820148 bytes -SHA1 (patch-aa) = 6cbdc01338b162a4bde6e2d55c5b3571a8bc66d3 +SHA1 (patch-aa) = afb8d7805c2c01c131bc4a7949a532e5372817c0 SHA1 (patch-ab) = b5c98fc990606e2f5c566864d02565d8fc9adeb4 SHA1 (patch-ac) = bc9a4e5d77d571a6f06b88984fb2030beec37654 -SHA1 (patch-ad) = 909612a85a4c46a13f9de3408df4c69e502c02a5 +SHA1 (patch-ad) = 7fddbe93dda4ddb659b050b0b511f5cb19e2777e SHA1 (patch-ae) = 19dbdb326643bf32a3d0c26cfea056cca19deb13 SHA1 (patch-af) = 976cbe2b27c23a113c43cab791562a04d9e6d7e3 SHA1 (patch-ag) = c53cc22ac5a2c5d5b2c1a7b0825558d8787b2bed @@ -34,3 +34,10 @@ SHA1 (patch-bb) = 63dde49eaf61bf85ce6dae12ec9af33ae4addfb5 SHA1 (patch-bc) = 9c8d886a5b412e64a9a8e6165110a5c336ff65ae SHA1 (patch-bd) = 840ce6ceb34afea4c8b789c70fb848ad9942ce39 SHA1 (patch-be) = dd353978d62cc45aadf6259e8b5f7b2895317f9c +SHA1 (patch-bf) = 1c56789841982089a32bdcca8465f6d2112503b0 +SHA1 (patch-bg) = 8a7c8e5d081d261b7493d633931d7003f49001ae +SHA1 (patch-bh) = c62928b6b8c4857ddb373ab3ac7f111442672b9d +SHA1 (patch-bi) = 96f44172271f9a45f9136bda159371ee709da59a +SHA1 (patch-bj) = 43cf376dddf9f91dceee8d1eba853171fd873905 +SHA1 (patch-bk) = 98f836c7007a668b812d119be294842a957cb507 +SHA1 (patch-bl) = 12a9846fc08e8c3110897644d7803f67999b68f8 diff --git a/devel/gdb6/patches/patch-aa b/devel/gdb6/patches/patch-aa index f9c557631b7..35c29f16e67 100644 --- a/devel/gdb6/patches/patch-aa +++ b/devel/gdb6/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2005/02/22 15:22:02 shannonjr Exp $ +$NetBSD: patch-aa,v 1.2 2006/03/14 00:47:50 joerg Exp $ ---- gdb/i386bsd-nat.c.orig 2004-05-31 05:20:41.000000000 -0600 +--- gdb/i386bsd-nat.c.orig 2004-05-31 11:20:41.000000000 +0000 +++ gdb/i386bsd-nat.c @@ -33,6 +33,19 @@ @@ -22,25 +22,42 @@ $NetBSD: patch-aa,v 1.1 2005/02/22 15:22:02 shannonjr Exp $ /* In older BSD versions we cannot get at some of the segment -@@ -373,7 +386,7 @@ _initialize_i386bsd_nat (void) +@@ -349,7 +362,7 @@ _initialize_i386bsd_nat (void) + system header files and sysctl(3) to get at the relevant + information. */ + +-#if defined (__FreeBSD_version) && __FreeBSD_version >= 400011 ++#if defined(__DragonFly__) || (defined (__FreeBSD_version) && __FreeBSD_version >= 400011) + #define SC_REG_OFFSET i386fbsd4_sc_reg_offset + #elif defined (__FreeBSD_version) && __FreeBSD_version >= 300005 + #define SC_REG_OFFSET i386fbsd_sc_reg_offset +@@ -373,7 +386,11 @@ _initialize_i386bsd_nat (void) /* Override the default value for the offset of the program counter in the sigcontext structure. */ - offset = offsetof (struct sigcontext, sc_pc); ++#if defined(__DragonFly__) ++ offset = offsetof (ucontext_t, uc_mcontext.mc_eip); ++#else + offset = offsetof (ucontext_t, uc_mcontext.__gregs[_REG_EIP]); ++#endif if (SC_PC_OFFSET != offset) { -@@ -386,7 +399,7 @@ Please report this to <bug-gdb@gnu.org>. +@@ -386,7 +403,11 @@ Please report this to <bug-gdb@gnu.org>. SC_PC_OFFSET = offset; /* Likewise for the stack pointer. */ - offset = offsetof (struct sigcontext, sc_sp); ++#if defined(__DragonFly__) ++ offset = offsetof (ucontext_t, uc_mcontext.mc_esp); ++#else + offset = offsetof (ucontext_t, uc_mcontext.__gregs[_REG_UESP]); ++#endif if (SC_SP_OFFSET != offset) { -@@ -399,7 +412,7 @@ Please report this to <bug-gdb@gnu.org>. +@@ -399,7 +420,7 @@ Please report this to <bug-gdb@gnu.org>. SC_SP_OFFSET = offset; /* And the frame pointer. */ diff --git a/devel/gdb6/patches/patch-ad b/devel/gdb6/patches/patch-ad index 21091aca509..0962741e372 100644 --- a/devel/gdb6/patches/patch-ad +++ b/devel/gdb6/patches/patch-ad @@ -1,8 +1,18 @@ -$NetBSD: patch-ad,v 1.1 2005/10/20 17:48:49 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2006/03/14 00:47:50 joerg Exp $ ---- ./gdb/bsd-kvm.c.orig 2004-07-03 07:17:33.000000000 -0600 -+++ ./gdb/bsd-kvm.c -@@ -228,7 +228,11 @@ bsd_kvm_proc_cmd (char *arg, int fromtty +--- gdb/bsd-kvm.c.orig 2004-07-03 13:17:33.000000000 +0000 ++++ gdb/bsd-kvm.c +@@ -33,7 +33,9 @@ + #include <nlist.h> + #include "readline/readline.h" + #include <sys/param.h> ++#if !defined(__DragonFly__) + #include <sys/proc.h> ++#endif + #include <sys/user.h> + + #include "bsd-kvm.h" +@@ -228,7 +230,11 @@ bsd_kvm_proc_cmd (char *arg, int fromtty error ("No kernel memory image."); addr = parse_and_eval_address (arg); diff --git a/devel/gdb6/patches/patch-bf b/devel/gdb6/patches/patch-bf new file mode 100644 index 00000000000..7002df26ac7 --- /dev/null +++ b/devel/gdb6/patches/patch-bf @@ -0,0 +1,13 @@ +$NetBSD: patch-bf,v 1.1 2006/03/14 00:47:50 joerg Exp $ + +--- bfd/config.bfd.orig 2006-03-01 00:39:22.000000000 +0000 ++++ bfd/config.bfd +@@ -470,7 +470,7 @@ case "${targ}" in + targ_selvecs=i386bsd_vec + targ_underscore=yes + ;; +- i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu) ++ i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*) + targ_defvec=bfd_elf32_i386_freebsd_vec + targ_selvecs=i386coff_vec + # FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling. diff --git a/devel/gdb6/patches/patch-bg b/devel/gdb6/patches/patch-bg new file mode 100644 index 00000000000..6073a8a1ad7 --- /dev/null +++ b/devel/gdb6/patches/patch-bg @@ -0,0 +1,50 @@ +$NetBSD: patch-bg,v 1.1 2006/03/14 00:47:50 joerg Exp $ + +--- bfd/configure.orig 2006-03-01 00:38:13.000000000 +0000 ++++ bfd/configure +@@ -3923,9 +3923,12 @@ echo "configure:3923: checking for gette + if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else ++ ac_save_LIBS="$LIBS" ++LIBS="-lintl $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3928 "configure" + #include "confdefs.h" ++#include <libintl.h> + + int main() { + return (int) gettext ("") +@@ -3941,6 +3944,7 @@ else + gt_cv_func_gettext_libintl=no + fi + rm -f conftest* ++LIBS="$ac_save_LIBS" + fi + + echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6 +@@ -5306,7 +5310,7 @@ if test "${target}" = "${host}"; then + COREFILE=trad-core.lo + TRAD_HEADER='"hosts/i386bsd.h"' + ;; +- i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu) ++ i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu| i[3-7]86-*-dragonfly*) + COREFILE='' + TRAD_HEADER='"hosts/i386bsd.h"' + ;; +@@ -6292,6 +6296,7 @@ do + bfd_elf32_hppa_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; + bfd_elf32_i370_vec) tb="$tb elf32-i370.lo elf32.lo $elf" ;; + bfd_elf32_i386_freebsd_vec) tb="$tb elf32-i386.lo elf32.lo $elf" ;; ++ bfd_elf32_i386_dragonfly_vec) tb="$tb elf32-i386.lo elf32.lo $elf" ;; + bfd_elf32_i386_vec) tb="$tb elf32-i386.lo elf32.lo $elf" ;; + bfd_elf32_i860_little_vec) tb="$tb elf32-i860.lo elf32.lo $elf" ;; + bfd_elf32_i860_vec) tb="$tb elf32-i860.lo elf32.lo $elf" ;; +@@ -6402,6 +6407,7 @@ do + i386coff_vec) tb="$tb coff-i386.lo cofflink.lo" ;; + i386dynix_vec) tb="$tb i386dynix.lo aout32.lo" ;; + i386freebsd_vec) tb="$tb i386freebsd.lo aout32.lo" ;; ++ i386dragonfly_vec) tb="$tb i386freebsd.lo aout32.lo" ;; + i386linux_vec) tb="$tb i386linux.lo aout32.lo" ;; + i386lynx_aout_vec) tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;; + i386lynx_coff_vec) tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;; diff --git a/devel/gdb6/patches/patch-bh b/devel/gdb6/patches/patch-bh new file mode 100644 index 00000000000..dd7d23f5337 --- /dev/null +++ b/devel/gdb6/patches/patch-bh @@ -0,0 +1,12 @@ +$NetBSD: patch-bh,v 1.1 2006/03/14 00:47:50 joerg Exp $ + +--- gdb/configure.tgt.orig 2006-03-01 00:40:30.000000000 +0000 ++++ gdb/configure.tgt +@@ -40,6 +40,7 @@ case "${target}" in + + x86_64-*-freebsd*) gdb_target=fbsd64 ;; + *-*-freebsd*) gdb_target=fbsd ;; ++*-*-dragonfly*) gdb_target=fbsd ;; + + alpha*-*-osf*) gdb_target=alpha-osf1 ;; + alpha*-*-linux*) gdb_target=alpha-linux ;; diff --git a/devel/gdb6/patches/patch-bi b/devel/gdb6/patches/patch-bi new file mode 100644 index 00000000000..955521539ce --- /dev/null +++ b/devel/gdb6/patches/patch-bi @@ -0,0 +1,13 @@ +$NetBSD: patch-bi,v 1.1 2006/03/14 00:47:50 joerg Exp $ + +--- gdb/configure.host.orig 2006-03-01 00:41:02.000000000 +0000 ++++ gdb/configure.host +@@ -54,7 +54,7 @@ hppa*-*-openbsd*) gdb_host=obsd ;; + + i[34567]86-ncr-*) gdb_host=ncr3000 ;; + i[34567]86-*-dgux*) gdb_host=i386v4 ;; +-i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu) ++i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-dragonfly*) + gdb_host=fbsd ;; + i[34567]86-*-netbsdelf* | i[34567]86-*-knetbsd*-gnu) + gdb_host=nbsdelf ;; diff --git a/devel/gdb6/patches/patch-bj b/devel/gdb6/patches/patch-bj new file mode 100644 index 00000000000..271f7158197 --- /dev/null +++ b/devel/gdb6/patches/patch-bj @@ -0,0 +1,67 @@ +$NetBSD: patch-bj,v 1.1 2006/03/14 00:47:50 joerg Exp $ + +--- gdb/configure.orig 2004-07-17 11:29:05.000000000 +0000 ++++ gdb/configure +@@ -2405,9 +2405,12 @@ echo "configure:2405: checking for gette + if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else ++ ac_save_LIBS="$LIBS" ++LIBS="-lintl $LIBS" + cat > conftest.$ac_ext <<EOF + #line 2410 "configure" + #include "confdefs.h" ++#include <libintl.h> + + int main() { + return (int) gettext ("") +@@ -2423,6 +2426,7 @@ else + gt_cv_func_gettext_libintl=no + fi + rm -f conftest* ++LIBS="$ac_save_LIBS" + fi + + echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6 +@@ -7323,6 +7327,41 @@ EOF + + fi + ++# See if <sys/lwp.h> defines `struct lwp`. ++echo $ac_n "checking for struct lwp""... $ac_c" 1>&6 ++echo "configure:7318: checking for struct lwp" >&5 ++if eval "test \"`echo '$''{'gdb_cv_struct_lwp'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ cat > conftest.$ac_ext <<EOF ++#line 7323 "configure" ++#include "confdefs.h" ++#include <sys/param.h> ++#include <sys/lwp.h> ++int main() { ++struct lwp l; ++; return 0; } ++EOF ++if { (eval echo configure:7331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ gdb_cv_struct_lwp=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ gdb_cv_struct_lwp=no ++fi ++rm -f conftest* ++fi ++ ++echo "$ac_t""$gdb_cv_struct_lwp" 1>&6 ++if test $gdb_cv_struct_lwp = yes; then ++ cat >> confdefs.h <<\EOF ++#define HAVE_STRUCT_LWP 1 ++EOF ++ ++fi ++ + # See if <machine/reg.h> degines `struct reg'. + echo $ac_n "checking for struct reg in machine/reg.h""... $ac_c" 1>&6 + echo "configure:7329: checking for struct reg in machine/reg.h" >&5 diff --git a/devel/gdb6/patches/patch-bk b/devel/gdb6/patches/patch-bk new file mode 100644 index 00000000000..f4c28214081 --- /dev/null +++ b/devel/gdb6/patches/patch-bk @@ -0,0 +1,25 @@ +$NetBSD: patch-bk,v 1.1 2006/03/14 00:47:50 joerg Exp $ + +--- opcodes/configure.orig 2006-03-13 22:59:10.000000000 +0000 ++++ opcodes/configure +@@ -3900,9 +3900,12 @@ echo "configure:3900: checking for gette + if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else ++ ac_save_LIBS="$LIBS" ++LIBS="-lintl $LIBS" + cat > conftest.$ac_ext <<EOF + #line 3905 "configure" + #include "confdefs.h" ++#include <libintl.h> + + int main() { + return (int) gettext ("") +@@ -3918,6 +3921,7 @@ else + gt_cv_func_gettext_libintl=no + fi + rm -f conftest* ++LIBS="$ac_save_LIBS" + fi + + echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6 diff --git a/devel/gdb6/patches/patch-bl b/devel/gdb6/patches/patch-bl new file mode 100644 index 00000000000..631466ae59f --- /dev/null +++ b/devel/gdb6/patches/patch-bl @@ -0,0 +1,13 @@ +$NetBSD: patch-bl,v 1.1 2006/03/14 00:47:50 joerg Exp $ + +--- gdb/Makefile.in.orig 2006-03-13 23:43:10.000000000 +0000 ++++ gdb/Makefile.in +@@ -125,7 +125,7 @@ GDB_WERROR_CFLAGS = $(WERROR_CFLAGS) + + # Where is the INTL library? Typically in ../intl. + INTL_DIR = ../intl +-INTL = @INTLLIBS@ ++INTL = -L${PREFIX}/lib -R${PREFIX}/lib -lintl + INTL_DEPS = @INTLDEPS@ + INTL_SRC = $(srcdir)/$(INTL_DIR) + INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC) |