Updated for sparc64-multilib. Added patch to properly detect sparc64b CHOST.

diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index b6d0bf16fb182320207d4117fee65e829bc0fe62..9a0a8c5c46c5d2376d00bb729b2be611e5574326 100644 (file)
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/binutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.171 2004/12/04 07:32:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.172 2004/12/11 06:12:06 eradicator Exp $
+
+  10 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/2.15/10_sparc_binutils-sparc64-multilib.patch,
+  binutils-2.15.92.0.2-r1.ebuild:
+  Updated for sparc64-multilib.  Added patch to properly detect sparc64b CHOST.
 
 *binutils-2.15.90.0.1.1-r4 (04 Dec 2004)
 

diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index d1dbb2da77a80e256f7ab7a682cee9c7dcc0794d..536b477ecc971cd8cdd31c2eab89deebe658db0b 100644 (file)
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -1,36 +1,36 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dc78829e75529ad6ac80a512cb6baefe ChangeLog 37511
+MD5 2bb6cab8d6cfe476837f82b3dbb34ee9 ChangeLog 37743
+MD5 5592af01b4edd8259ffab688578acdb0 binutils-2.15.94.0.1.ebuild 441
 MD5 9e9aaba5c0f359d4fd788d985248f49e binutils-2.14.90.0.6-r8.ebuild 435
+MD5 3d0d31288270f1f9adedea59a72c7fa7 binutils-2.15.90.0.1.1-r4.ebuild 488
 MD5 4f6ea11b17fc6d7fdb7f78bf9bfaada2 binutils-2.15.ebuild 368
+MD5 965edb0800850b35cc8d6a020d49a00a binutils-2.15.92.0.2-r2.ebuild 530
+MD5 1bb1dac74aec61b33248f85c53583a6e binutils-2.14.90.0.6-r7.ebuild 6738
 MD5 87ca3fa1a3189445953eb76990dd07d2 binutils-2.14.90.0.7-r4.ebuild 6283
 MD5 9bdfdde9790fd6f215adcaecaa6806ad binutils-2.14.90.0.8-r1.ebuild 5050
-MD5 1bb1dac74aec61b33248f85c53583a6e binutils-2.14.90.0.6-r7.ebuild 6738
+MD5 b80c33b9ecdee15dcfe073ac18bffbbe binutils-2.15.90.0.1.1-r3.ebuild 4796
 MD5 0c25a829197c155f46205e5a23ea4e16 binutils-2.15.90.0.3-r3.ebuild 4975
 MD5 0a2e87d8fa7ba203b47fc8f5c795ec42 binutils-2.15.91.0.1.ebuild 4707
-MD5 47b50dfab666ec01e53e417deeb957d5 binutils-2.15.91.0.2.ebuild 5161
-MD5 fa3f06c06561bb68def8014643737e10 binutils-2.15.92.0.2-r1.ebuild 4878
-MD5 5592af01b4edd8259ffab688578acdb0 binutils-2.15.94.0.1.ebuild 441
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 965edb0800850b35cc8d6a020d49a00a binutils-2.15.92.0.2-r2.ebuild 530
-MD5 3d0d31288270f1f9adedea59a72c7fa7 binutils-2.15.90.0.1.1-r4.ebuild 488
-MD5 b80c33b9ecdee15dcfe073ac18bffbbe binutils-2.15.90.0.1.1-r3.ebuild 4796
+MD5 47b50dfab666ec01e53e417deeb957d5 binutils-2.15.91.0.2.ebuild 5161
+MD5 623a14f1b810af79b96943de6aaf2648 binutils-2.15.92.0.2-r1.ebuild 5407
+MD5 8903d93c82472f0a22bfdcac81fda9fb files/digest-binutils-2.15.92.0.2-r2 249
+MD5 6c06201fe991e098f44f6f75dd5d53f4 files/digest-binutils-2.15 68
 MD5 e3effee7a8054f5e0344034c596cb6fc files/binutils-2.14.amd64-32bit-path-fix.patch 456
 MD5 27d56922c88f9b37c495153ea251348d files/digest-binutils-2.15.94.0.1 249
-MD5 6c06201fe991e098f44f6f75dd5d53f4 files/digest-binutils-2.15 68
-MD5 c19b60c5d77c4e0779d7820598b3b749 files/digest-binutils-2.14.90.0.7-r4 75
-MD5 d57be7837bb42388ad4f1f9eec6fe699 files/digest-binutils-2.14.90.0.8-r1 160
 MD5 bce6e94a306210a3a46ff8a78ad85df1 files/digest-binutils-2.14.90.0.6-r8 249
 MD5 7b0c1e491cb6bc7058193b4443071071 files/digest-binutils-2.15.90.0.1.1-r4 255
+MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r7 75
+MD5 c19b60c5d77c4e0779d7820598b3b749 files/digest-binutils-2.14.90.0.7-r4 75
+MD5 d57be7837bb42388ad4f1f9eec6fe699 files/digest-binutils-2.14.90.0.8-r1 160
+MD5 f5cb20158fe6b87f03a2366b68866343 files/digest-binutils-2.15.90.0.1.1-r3 161
 MD5 83bd52b9c2e975443e2a8b11b59c7441 files/digest-binutils-2.15.90.0.3-r3 159
 MD5 9ee0463e60aaa51448aba92f5fc86f04 files/digest-binutils-2.15.91.0.1 159
+MD5 66df5567226338b7504bbd3c25cea92c files/libiberty-pic.patch 370
 MD5 754cfdc4c162c0cac9c073198f732fdb files/digest-binutils-2.15.91.0.2 159
 MD5 1b43962f0560663b6b0f58ffa918a8ff files/digest-binutils-2.15.92.0.2-r1 242
-MD5 8903d93c82472f0a22bfdcac81fda9fb files/digest-binutils-2.15.92.0.2-r2 249
-MD5 66df5567226338b7504bbd3c25cea92c files/libiberty-pic.patch 370
-MD5 3b32997c2ca6b9893839c439e077e82d files/digest-binutils-2.14.90.0.6-r7 75
-MD5 f5cb20158fe6b87f03a2366b68866343 files/digest-binutils-2.15.90.0.1.1-r3 161
 MD5 b811d65855a74369e0faccf7574b886b files/2.13/binutils-2.13.90.0.10-glibc21.patch 2931
 MD5 1841b2037b3da0e0dfddb0345a0526e8 files/2.13/binutils-2.13.90.0.10-x86_64-gotpcrel.patch 769
 MD5 cbf08de84154ca2dcf26e572f2892f00 files/2.13/binutils-2.13.90.0.10-x86_64-testsuite.patch 1205
@@ -61,10 +61,6 @@ MD5 d5afbb421242988c33551fdb2054581b files/2.14/binutils-2.14.90.0.5-s390-pie.pa
 MD5 16fb9c43491e0ce0d22c9cba008ca983 files/2.14/binutils-2.14.90.0.6-bfd-elf-interp-3.patch 637
 MD5 2bc2ff3c3e1b608f1c3776246a5000c1 files/2.14/binutils-2.14.90.0.6-bfd-elf-interp-4.patch 1284
 MD5 f9b9a43d7cd42c79b7f8144c6611f31c files/2.14/binutils-2.14.90.0.6-bfd-elf-interp.patch 391
-MD5 37856b4142539ef22682d43cf880a0bf files/2.14/binutils-2.14.90.0.6-build_modules.patch 939
-MD5 f2b54c4e03c2df44407beec56efbc2bd files/2.14/binutils-2.14.90.0.6-cflags.patch 1645
-MD5 1835ff629b956356a771fb7146d828c3 files/2.14/binutils-2.14.90.0.6-conf.patch 25485
-MD5 8dfe15fc6599a60b3330ab9fdabaf60f files/2.14/binutils-2.14.90.0.6-debian.patch 7090
 MD5 559bf684bf26c292862d4287f047111c files/2.14/binutils-2.14.90.0.6-dont-crash-on-null-owner.patch 822
 MD5 e3d1a3d9743bd5831241af6920bef2ee files/2.14/binutils-2.14.90.0.6-eh-frame-ro-2.patch 14702
 MD5 09de3fa664f792872af4d6a029909315 files/2.14/binutils-2.14.90.0.6-eh-frame-ro.patch 14503
@@ -79,13 +75,18 @@ MD5 a911368168c533afc8a3292b66558b03 files/2.14/binutils-2.14.90.0.7-bfd-pt-gnu-
 MD5 8a0fb0b91441ffa6bd3bbea118d4fad8 files/2.14/binutils-2.14.90.0.7-ppc-reloc.patch 43472
 MD5 769e30e09537d7bd8539e404cc3958aa files/2.14/binutils-2.14.90.0.7-tls-section-alignment.patch 37977
 MD5 03d6c934577cf40ec75b41bfc38b48a0 files/2.14/binutils-mips-openssl-got-fix.patch 540
+MD5 37856b4142539ef22682d43cf880a0bf files/2.14/binutils-2.14.90.0.6-build_modules.patch 939
+MD5 f2b54c4e03c2df44407beec56efbc2bd files/2.14/binutils-2.14.90.0.6-cflags.patch 1645
+MD5 1835ff629b956356a771fb7146d828c3 files/2.14/binutils-2.14.90.0.6-conf.patch 25485
+MD5 8dfe15fc6599a60b3330ab9fdabaf60f files/2.14/binutils-2.14.90.0.6-debian.patch 7090
 MD5 8f619fc0c409a5ba768f126f172ee6bc files/2.15/05_all_binutils-2.15-elf32-arm-textrel.patch 2009
-MD5 907ce8c972e2a984590d4bfc04181c1d files/2.15/40_all_binutils-uclibc-linker.patch 530
 MD5 bad6ba9f63eb3a86d7006191848a47b8 files/2.15/52_all_binutils-20040527-uclibc-100-conf.patch 21576
+MD5 907ce8c972e2a984590d4bfc04181c1d files/2.15/40_all_binutils-uclibc-linker.patch 530
+MD5 9c5782a322eafe22ead93694ff654dfe files/2.15/10_sparc_binutils-sparc64-multilib.patch 907
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBuOP8roRuSHgZdywRAsnUAJ4olRZ7X10CFwh0joSgpEQnd4N6LwCfcb9k
-1KkdltQ7yydgVCrZEpW/CcA=
-=5AOc
+iD8DBQFBupC/ArHZZzCEUG0RAt50AJ9JV5jpq56WHqBTiu069J/+LdiYEwCeL2LJ
+2wprC+b0fPJ0fLviAaA3idU=
+=9Iiq
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild b/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild
index fbdc1fc5370fb9055680b2eef14f8fb31ff114e7..692ba27ce00f9e6df5eca238e18b53cb1360476e 100644 (file)
--- a/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild,v 1.15 2004/12/09 23:46:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.92.0.2-r1.ebuild,v 1.16 2004/12/11 06:12:06 eradicator Exp $
 
 inherit eutils libtool flag-o-matic gnuconfig
 
@@ -46,6 +46,9 @@ src_unpack() {
                rm -rf ${x}.orig
        done
 
+       # Fix regexps in configure.host
+       epatch ${FILESDIR}/2.15/10_sparc_binutils-sparc64-multilib.patch
+
        gnuconfig_update
 }
 
@@ -134,17 +137,28 @@ src_install() {
                ln -s ../${CHOST}/bin/${x} ${x}
        done
 
-       if [ -n "${PROFILE_ARCH}" ] && \
-          [ "${PROFILE_ARCH/64}" != "${PROFILE_ARCH}" ]
-       then
-               dosym ${CHOST} /usr/${CHOST/-/64-}
-
-               for x in `ls ${D}/usr/${CHOST}/bin/`
-               do
-                       [ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
-                               dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
-                       dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
-               done
+       if [ -n "${PROFILE_ARCH}" ]; then
+               if [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then
+                       dosym ${CHOST} /usr/${CHOST32}
+
+                       for x in `ls ${D}/usr/${CHOST}/bin/`
+                       do
+                               [ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+                                       dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+                               dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST32}-${x}
+                               [ ! -e "${D}/usr/bin/${CHOST32}-${x}" ] && \
+                                       dosym ../${CHOST32}/bin/${x} /usr/bin/${CHOST32}-${x}
+                       done
+               elif [ "${PROFILE_ARCH/64}" != "${PROFILE_ARCH}" ]; then
+                       dosym ${CHOST} /usr/${CHOST/-/64-}
+
+                       for x in `ls ${D}/usr/${CHOST}/bin/`
+                       do
+                               [ ! -e "${D}/usr/bin/${CHOST}-${x}" ] && \
+                                       dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST}-${x}
+                               dosym ../${CHOST}/bin/${x} /usr/bin/${CHOST/-/64-}-${x}
+                       done
+               fi
        fi
 
        cd ${S}

diff --git a/sys-devel/binutils/files/2.15/10_sparc_binutils-sparc64-multilib.patch b/sys-devel/binutils/files/2.15/10_sparc_binutils-sparc64-multilib.patch
new file mode 100644 (file)
index 0000000..895bb36
--- /dev/null
+++ b/sys-devel/binutils/files/2.15/10_sparc_binutils-sparc64-multilib.patch
@@ -0,0 +1,19 @@
+--- binutils-2.15.92.0.2/ld/configure.host.orig        2004-05-27 11:26:04.000000000 -0700
++++ binutils-2.15.92.0.2/ld/configure.host     2004-12-10 18:17:33.986011492 -0800
+@@ -209,12 +209,12 @@
+   HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi` `if [ -f ../gcc/crtn.o ]; then echo ../gcc/crtn.o; else ${CC} -print-file-name=crtn.o; fi`'
+   ;;
+ 
+-sparc-*-linux-gnu*)
+-  HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`egrep.*\"\\\`,/lib/ld-linux.so.2,"`
++sparc64*-*-linux-gnu*)
++  HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`egrep.*\"\\\`,/lib64/ld-linux.so.2,"`
+   ;;
+ 
+-sparc64-*-linux-gnu*)
+-  HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`egrep.*\"\\\`,/lib64/ld-linux.so.2,"`
++sparc*-*-linux-gnu*)
++  HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`egrep.*\"\\\`,/lib/ld-linux.so.2,"`
+   ;;
+ 
+ x86_64-*-linux-gnu*)