- minor touch ups for mips/x86/uclibc/pic

(Portage version: 2.0.51.21)

7 files changed, 160 insertions, 35 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index f8fd10de3a82..f0dbf12264df 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.72 2005/05/06 15:51:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.73 2005/05/06 16:24:45 solar Exp $
+
+  06 May 2005; <solar@gentoo.org>
+  +files/gdb-6.2.1-200-uclibc-readline-conf.patch,
+  +files/gdb-6.2.1-400-mips-coredump.patch,
+  +files/gdb-6.2.1-libiberty-pic.patch, +files/gdb-6.3-pass_all-uclibc.patch,
+  gdb-6.3-r3.ebuild:
+  - minor touch ups for mips/x86/uclibc/pic
 
   06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> gdb-6.3-r3.ebuild:
   Stable on sparc wrt #91654
diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index a38903a5d396..0462916e4728 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,45 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d1b180b165082a393d4fc94d5e6f4008 ChangeLog 10274
+MD5 57458d1a8413bf3f90849fb93f2747d5 gdb-6.3.ebuild 2446
 MD5 c2e11638acab3f11b88466a4f261eacc gdb-6.0-r1.ebuild 2043
 MD5 e0f3ee7e8ce992eefd2302af54b33d6a gdb-6.0.ebuild 1906
-MD5 686556423ec5590d0341718d4a545189 gdb-6.1.1.ebuild 1850
-MD5 2a52c4cd9bf5e2667c6bc7312e179fa0 gdb-6.1.ebuild 1807
 MD5 4fd3e363d0a40676217df9b0faee4d80 gdb-6.2.1-r1.ebuild 1928
-MD5 fb4ab4aaccb90b523c650a5f30d02281 gdb-6.2.1.ebuild 1784
 MD5 44fe1e6f031c991736e4ea4b17697926 gdb-6.2.ebuild 1782
+MD5 686556423ec5590d0341718d4a545189 gdb-6.1.1.ebuild 1850
+MD5 761a0e7bae05566a9ac1cd0d054e067c gdb-6.3-r3.ebuild 3034
+MD5 fb4ab4aaccb90b523c650a5f30d02281 gdb-6.2.1.ebuild 1784
+MD5 1708e11344521bed9724233a044bc6f2 ChangeLog 10547
+MD5 2a52c4cd9bf5e2667c6bc7312e179fa0 gdb-6.1.ebuild 1807
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 57458d1a8413bf3f90849fb93f2747d5 gdb-6.3.ebuild 2446
-MD5 204f47697109932656585705ec657ddb gdb-6.3-r3.ebuild 2818
-MD5 420712ede2a47fedcae76b6f6215b9d4 files/digest-gdb-6.0 62
-MD5 c87a4627da2b7a05406088f51237e5b4 files/digest-gdb-6.0-r1 127
-MD5 460629563df21e6a68b8941c07d4f30b files/digest-gdb-6.1 131
+MD5 c6dfff1373e52fef5872c1bdca4cb706 files/gdb-6.0-info.patch 1108
+MD5 d3ab2683d88b3cbecb8a9faa439703a1 files/bfd-malloc-wrap.patch 782
+MD5 7ea8f83bb7b0d70e7e6d6c8cf42292d3 files/gdb-6.x-crash.patch 678
+MD5 dc01eff75d7495a2159e2ff9fc48f164 files/gdb-6.0-xfreemod-all.patch 1599
 MD5 688c499ca8b7c9006c978595fe5461a7 files/digest-gdb-6.1.1 133
-MD5 bcc4ae6718ad45a97ca7822df03bb8af files/digest-gdb-6.2 131
 MD5 b3790be989db97b22c599572afbce109 files/digest-gdb-6.2.1 133
-MD5 b3790be989db97b22c599572afbce109 files/digest-gdb-6.2.1-r1 133
-MD5 1de0e1b91ac150426719e904f0e1a5cd files/gdb-5.3-sparc-nat-asm.patch 521
 MD5 e497ab2f05d847bde74f4e3441e2c7a2 files/gdb-6.0-coreutils.patch 1964
-MD5 c6dfff1373e52fef5872c1bdca4cb706 files/gdb-6.0-info.patch 1108
-MD5 adbe09f334ca5267284ca9404400d2f5 files/gdb-6.0-threadver-aug2003.patch 4081
-MD5 dc01eff75d7495a2159e2ff9fc48f164 files/gdb-6.0-xfreemod-all.patch 1599
-MD5 1da0dcdbff7ba48a06350a28ecdd238e files/gdb-6.1-ppc64-01.patch 359
-MD5 cc65dade388e6a21b5858b146f52b6eb files/gdb-6.1-uclibc.patch 6363
 MD5 37007f485c9f93564f99675e59b65e7f files/gdb-6.2.1-pass-libdir.patch 300
+MD5 1de0e1b91ac150426719e904f0e1a5cd files/gdb-5.3-sparc-nat-asm.patch 521
+MD5 b3790be989db97b22c599572afbce109 files/digest-gdb-6.2.1-r1 133
+MD5 c7d303fad9794b8a463bddf3c43737e5 files/gdb-6.2.1-200-uclibc-readline-conf.patch 586
+MD5 cc65dade388e6a21b5858b146f52b6eb files/gdb-6.1-uclibc.patch 6363
+MD5 a24daaa8f5cc93ee0ca205e847dc982b files/gdb-6.3-pass_all-uclibc.patch 2295
+MD5 9b939edb72d0e54160869b48f2ebc080 files/gdb-6.2.1-400-mips-coredump.patch 736
+MD5 a4610ec65e88f73e0b00b525467a5372 files/gdb-6.3-scanmem.patch 6652
+MD5 2657b597618d0c35b48f47e3f808d171 files/gdb-6.3-relative-paths.patch 3286
+MD5 cc707a338c9f8264cf961b457f2c09d9 files/gdb-6.3-gdbinit-stat.patch 429
 MD5 374352fdf0b1516a88eeaf0a921a2208 files/gdb-6.2.1-relative-paths.patch 3499
-MD5 7ea8f83bb7b0d70e7e6d6c8cf42292d3 files/gdb-6.x-crash.patch 678
+MD5 420712ede2a47fedcae76b6f6215b9d4 files/digest-gdb-6.0 62
+MD5 460629563df21e6a68b8941c07d4f30b files/digest-gdb-6.1 131
+MD5 bcc4ae6718ad45a97ca7822df03bb8af files/digest-gdb-6.2 131
 MD5 2560a7e81574df415f79e0798503ecc0 files/digest-gdb-6.3 121
-MD5 2657b597618d0c35b48f47e3f808d171 files/gdb-6.3-relative-paths.patch 3286
-MD5 a4610ec65e88f73e0b00b525467a5372 files/gdb-6.3-scanmem.patch 6652
-MD5 b676fe75d53ccd00bf7a9b762747fe89 files/gdb-6.3-uclibc.patch 6656
+MD5 adbe09f334ca5267284ca9404400d2f5 files/gdb-6.0-threadver-aug2003.patch 4081
+MD5 1da0dcdbff7ba48a06350a28ecdd238e files/gdb-6.1-ppc64-01.patch 359
+MD5 c87a4627da2b7a05406088f51237e5b4 files/digest-gdb-6.0-r1 127
 MD5 6516e95e4ed8409e4173d7f1f66f03b8 files/digest-gdb-6.3-r3 183
-MD5 cc707a338c9f8264cf961b457f2c09d9 files/gdb-6.3-gdbinit-stat.patch 429
-MD5 d3ab2683d88b3cbecb8a9faa439703a1 files/bfd-malloc-wrap.patch 782
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCe5J4KRy60XGEcJIRAmOmAJ9ypckon92PAOfgn9T7VpqIF4TEBwCeKTKt
-P2YppHK769zH+/2WdgLBovo=
-=eNdo
------END PGP SIGNATURE-----
+MD5 31dd65bca08d42b0b7cdb61c53fd647f files/gdb-6.2.1-libiberty-pic.patch 370
+MD5 b676fe75d53ccd00bf7a9b762747fe89 files/gdb-6.3-uclibc.patch 6656
diff --git a/sys-devel/gdb/files/gdb-6.2.1-200-uclibc-readline-conf.patch b/sys-devel/gdb/files/gdb-6.2.1-200-uclibc-readline-conf.patch
new file mode 100644
index 000000000000..ffe792dd0544
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.2.1-200-uclibc-readline-conf.patch
@@ -0,0 +1,15 @@
+--- gdb-6.1.1-dist/readline/configure	2003-05-27 18:29:47.000000000 -0500
++++ gdb-6.1.1/readline/configure	2004-08-09 14:20:23.000000000 -0500
+@@ -6249,7 +6249,12 @@
+ 
+ 
+ echo "$as_me:$LINENO: checking for mbstate_t" >&5
++echo $ECHO_N "bash_cv_have_mbstate_t=$bash_cv_have_mbstate_t" >&6
+ echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
++if test "${bash_cv_have_mbstate_t+set}" != set; then
++  bash_cv_have_mbstate_t=yes
++  echo $ECHO_N "WARNING!! forcing to yes!!! $ECHO_C" >&6
++fi
+ if test "${bash_cv_have_mbstate_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
diff --git a/sys-devel/gdb/files/gdb-6.2.1-400-mips-coredump.patch b/sys-devel/gdb/files/gdb-6.2.1-400-mips-coredump.patch
new file mode 100644
index 000000000000..4e17ba7beab0
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.2.1-400-mips-coredump.patch
@@ -0,0 +1,28 @@
+Sometime around 2.4.22-23, the mips pt_regs.h fields were reordered, breaking
+coredump handling by gdb for current kernels.  Update the hardcoded constants
+to reflect the change.
+--- gdb-6.2.1/gdb/mips-linux-tdep.c-orig	2004-10-29 14:23:55.000000000 -0500
++++ gdb-6.2.1/gdb/mips-linux-tdep.c	2004-10-29 14:26:44.000000000 -0500
+@@ -53,12 +53,22 @@
+ 
+ #define EF_REG0			6
+ #define EF_REG31		37
++
++#if 0
+ #define EF_LO			38
+ #define EF_HI			39
+ #define EF_CP0_EPC		40
+ #define EF_CP0_BADVADDR		41
+ #define EF_CP0_STATUS		42
+ #define EF_CP0_CAUSE		43
++#else
++#define EF_CP0_STATUS		38
++#define EF_LO			39
++#define EF_HI			40
++#define EF_CP0_BADVADDR		41
++#define EF_CP0_CAUSE		42
++#define EF_CP0_EPC		43
++#endif
+ 
+ #define EF_SIZE			180
+ 
diff --git a/sys-devel/gdb/files/gdb-6.2.1-libiberty-pic.patch b/sys-devel/gdb/files/gdb-6.2.1-libiberty-pic.patch
new file mode 100644
index 000000000000..413332107d94
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.2.1-libiberty-pic.patch
@@ -0,0 +1,10 @@
+--- libiberty/Makefile.in.mps	2004-05-13 15:53:17.000000000 +0200
++++ libiberty/Makefile.in	2004-05-13 15:52:53.000000000 +0200
+@@ -225,6 +225,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA
+ 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
+ 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
+ 	  $(RANLIB) $(TARGETLIB); \
++	  cp $(TARGETLIB) ../ ; \
+ 	  cd ..; \
+ 	else true; fi
+ 
diff --git a/sys-devel/gdb/files/gdb-6.3-pass_all-uclibc.patch b/sys-devel/gdb/files/gdb-6.3-pass_all-uclibc.patch
new file mode 100644
index 000000000000..1d8f6a92b3c1
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.3-pass_all-uclibc.patch
@@ -0,0 +1,66 @@
+--- gdb-6.3/opcodes/configure.mps	2005-05-06 09:15:56 +0200
++++ gdb-6.3/opcodes/configure	2005-05-06 09:17:25 +0200
+@@ -3577,16 +3577,15 @@
+ 
+ # This must be Linux ELF.
+ linux-gnu*)
+-  case $host_cpu in
+-  alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-  esac
++  lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
++linux-uclibc*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++  ;;
++
+ netbsd* | knetbsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
+--- gdb-6.3/bfd/configure.mps	2005-05-06 09:14:10 +0200
++++ gdb-6.3/bfd/configure	2005-05-06 09:14:21 +0200
+@@ -3573,13 +3573,7 @@
+ 
+ # This must be Linux ELF.
+ linux-gnu*)
+-  case $host_cpu in
+-  alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-  esac
++  lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+--- gdb-6.3/libtool.m4.mps	2005-05-06 09:10:28 +0200
++++ gdb-6.3/libtool.m4	2005-05-06 09:11:30 +0200
+@@ -635,19 +635,14 @@
+ 
+ # This must be Linux ELF.
+ linux-gnu*)
+-  case $host_cpu in
+-  alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;;
+-  esac
++  lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+ linux-uclibc*)
+   lt_cv_deplibs_check_method=pass_all
+   lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++  ;;
+ 
+ netbsd* | knetbsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
diff --git a/sys-devel/gdb/gdb-6.3-r3.ebuild b/sys-devel/gdb/gdb-6.3-r3.ebuild
index 48bf31b38cfa..266a96c84c25 100644
--- a/sys-devel/gdb/gdb-6.3-r3.ebuild
+++ b/sys-devel/gdb/gdb-6.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r3.ebuild,v 1.6 2005/05/06 15:51:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.3-r3.ebuild,v 1.7 2005/05/06 16:24:45 solar Exp $
 
 inherit flag-o-matic eutils
 
@@ -49,6 +49,11 @@ src_unpack() {
 	# sec bug 91398
 	epatch "${FILESDIR}"/bfd-malloc-wrap.patch
 
+	epatch ${FILESDIR}/gdb-6.2.1-200-uclibc-readline-conf.patch
+	epatch ${FILESDIR}/gdb-6.2.1-400-mips-coredump.patch
+	epatch ${FILESDIR}/gdb-6.2.1-libiberty-pic.patch
+	epatch ${FILESDIR}/gdb-6.3-pass_all-uclibc.patch
+
 	strip-linguas -u bfd/po opcodes/po
 }