A few more multilib fixes and install_locales now uses -j1 as it died on me because...

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 78e272b731e2bd9619b3eb846cd696d238c5e01a..a5e441c8c342d0ca97ae98da179edf45e68d9a7d 100644 (file)
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.302 2005/01/11 12:30:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.303 2005/01/11 22:25:44 eradicator Exp $
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:
+  A few more multilib fixes and install_locales now uses -j1 as it died on me
+  because of a parallel-make problem.
 
   11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   glibc-2.3.4.20040808-r1.ebuild, glibc-2.3.4.20041102.ebuild:

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d57cf9a96f7c35958539fdaa8f31502de240a02e..aa879e7a8661f3b252a6c8b9a3e298c15c4c1d1f 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cd13158dcc1642c3cabdf5c96f02f480 ChangeLog 64074
+MD5 ec1c31d4c2e13a30a63d80c49520e950 ChangeLog 64311
 MD5 5529417ce5503c488b1ccaaa2e781799 glibc-2.2.5-r9.ebuild 10915
 MD5 3b44d39389334d36b42c51887729dd4d glibc-2.3.2-r12.ebuild 21817
 MD5 39ac6b0f30c9c27a5cd04c4e0b6caadb glibc-2.3.3.20040420-r2.ebuild 21634
-MD5 92f49baec000e481a37e2490939bf017 glibc-2.3.4.20040808-r1.ebuild 25997
-MD5 a476f27e4cca3afc7df67280ccf2c2ef glibc-2.3.4.20041102.ebuild 30981
+MD5 a8021622967aa449fc9b1f26525d10ae glibc-2.3.4.20040808-r1.ebuild 25893
+MD5 d0753f922ec347a65d7850182f35595b glibc-2.3.4.20041102.ebuild 30873
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 e4c399efc30efc54fb478b897cd37149 glibc-2.3.4.20040619-r2.ebuild 21078
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
@@ -139,7 +139,7 @@ MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5EKDArHZZzCEUG0RAs/kAJoC1btu/w1TmosfevjbpHnuu+vsKwCdHS7a
-VyKeYKnqdR5a5w3AGAijatg=
-=yfmA
+iD8DBQFB5FKAArHZZzCEUG0RAlflAJ9mpEAHqkVI+fA4JnYwpAWodtmReACdGw7g
+zSFUQDwycRpchX8dHvLoWXU=
+=AnyO
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index 78cd73ef9c089031549b75eae3289ebd92a438ec..2de7aabfb53b0874d466242b724a29219eeb4f51 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.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-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.28 2005/01/11 21:17:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.29 2005/01/11 22:25:44 eradicator Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -306,7 +306,7 @@ want_tls() {
 install_locales() {
        unset LANGUAGE LANG LC_ALL
        cd ${WORKDIR}/build
-       make PARALLELMFLAGS="${MAKEOPTS}" \
+       make PARALLELMFLAGS="${MAKEOPTS} -j1" \
                install_root=${D} localedata/install-locales || die
        [[ ${CTARGET} = ${CHOST} ]] && keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
 }
@@ -689,7 +689,6 @@ src_install() {
                                mv ${D}/lib ${D}/$(get_abi_LIBDIR x86)
                                mv ${D}/usr/lib ${D}/usr/$(get_abi_LIBDIR x86)
                                mkdir ${D}/lib
-                               dosym ../$(get_abi_LIBDIR x86)/ld-linux.so.1 /lib/ld-linux.so.1
                                dosym ../$(get_abi_LIBDIR x86)/ld-linux.so.2 /lib/ld-linux.so.2
                                dosed "s:/lib/:/$(get_abi_LIBDIR x86)/:g" /usr/$(get_abi_LIBDIR x86)/libc.so /usr/$(get_abi_LIBDIR x86)/libpthread.so
                        fi
@@ -702,6 +701,9 @@ src_install() {
 
        setup_flags
 
+       # Need to dodir first because it might not exist (bad amd64 profiles)
+       dodir /usr/$(get_libdir)
+
        # These should not be set, else the
        # zoneinfo do not always get installed ...
        unset LANGUAGE LANG LC_ALL
@@ -726,21 +728,21 @@ src_install() {
        ls  ${T}/thread-backup/*  1>/dev/null 2>&1 && mv -f ${T}/thread-backup/* ${D}/$(alt_libdir)/
 
        # If librt.so is a symlink, change it into linker script (Redhat)
-       if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
-               local LIBRTSO="`cd ${D}/lib; echo librt.so.*`"
-               local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`"
+       if [ -L "${D}/usr/$(get_libdir)/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
+               local LIBRTSO="`cd ${D}/$(get_libdir); echo librt.so.*`"
+               local LIBPTHREADSO="`cd ${D}/$(get_libdir); echo libpthread.so.*`"
 
-               rm -f ${D}/usr/lib/librt.so
-               cat > ${D}/usr/lib/librt.so <<EOF
+               rm -f ${D}/usr/$(get_libdir)/librt.so
+               cat > ${D}/usr/$(get_libdir)/librt.so <<EOF
 /* GNU ld script
        librt.so.1 needs libpthread.so.0 to come before libc.so.6*
        in search scope.  */
 EOF
-               grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
-               echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
-                       >> ${D}/usr/lib/librt.so
+               grep "OUTPUT_FORMAT" ${D}/usr/$(get_libdir)/libc.so >> ${D}/usr/$(get_libdir)/librt.so
+               echo "GROUP ( /$(get_libdir)/${LIBPTHREADSO} /$(get_libdir)/${LIBRTSO} )" \
+                       >> ${D}/usr/$(get_libdir)/librt.so
 
-               for x in ${D}/usr/lib/librt.so.[1-9]; do
+               for x in ${D}/usr/$(get_libdir)/librt.so.[1-9]; do
                        [ -L "${x}" ] && rm -f ${x}
                done
        fi
@@ -804,17 +806,11 @@ EOF
        rm -f ${D}/etc/localtime
 
        # Some things want this, notably ash.
-       # Need to dodir first because it might not exist (bad amd64 profiles)
-       dodir /usr/$(get_libdir)
        dosym /usr/$(get_libdir)/libbsd-compat.a /usr/$(get_libdir)/libbsd.a
 
        # This is our new config file for building locales
        insinto /etc
        doins ${FILESDIR}/locales.build
-
-       # this test isn't using the correct directory on ppc64
-       # and really it's a worthless test
-       use !ppc64 && must_exist /$(get_libdir)/ libpthread.so.0
 }
 
 fix_lib64_symlinks() {

diff --git a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
index 80579122385150b2b230dfe517f1d7df6683ccc3..6ff9f1f6ced247856e5725469fb98a972184ad65 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20041102.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102.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-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.22 2005/01/11 21:17:43 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102.ebuild,v 1.23 2005/01/11 22:25:44 eradicator Exp $
 
 inherit eutils flag-o-matic gcc versionator
 
@@ -306,7 +306,7 @@ want_tls() {
 install_locales() {
        unset LANGUAGE LANG LC_ALL
        cd ${WORKDIR}/${MYMAINBUILDDIR} || die "${WORKDIR}/${MYMAINBUILDDIR}"
-       make PARALLELMFLAGS="${MAKEOPTS}" \
+       make PARALLELMFLAGS="${MAKEOPTS} -j1" \
                install_root=${D} localedata/install-locales || die
        keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
 }
@@ -735,7 +735,6 @@ src_install() {
                                mv ${D}/lib ${D}/$(get_abi_LIBDIR x86)
                                mv ${D}/usr/lib ${D}/usr/$(get_abi_LIBDIR x86)
                                mkdir ${D}/lib
-                               dosym ../$(get_abi_LIBDIR x86)/ld-linux.so.1 /lib/ld-linux.so.1
                                dosym ../$(get_abi_LIBDIR x86)/ld-linux.so.2 /lib/ld-linux.so.2
                                dosed "s:/lib/:/$(get_abi_LIBDIR x86)/:g" /usr/$(get_abi_LIBDIR x86)/libc.so /usr/$(get_abi_LIBDIR x86)/libpthread.so
                        fi
@@ -748,6 +747,9 @@ src_install() {
 
        setup_flags
 
+       # Need to dodir first because it might not exist (bad amd64 profiles)
+       dodir /usr/$(get_libdir)
+
        # These should not be set, else the
        # zoneinfo do not always get installed ...
        unset LANGUAGE LANG LC_ALL
@@ -924,8 +926,6 @@ EOF
        rm -f ${D}/etc/localtime
 
        # Some things want this, notably ash.
-       # Need to dodir first because it might not exist (bad amd64 profiles)
-       dodir /usr/$(get_libdir)
        dosym /usr/$(get_libdir)/libbsd-compat.a /usr/$(get_libdir)/libbsd.a
 
        insinto /etc
@@ -933,8 +933,6 @@ EOF
        doins ${FILESDIR}/locales.build
        # example host.conf with multicast dns disabled by default
        doins ${FILESDIR}/2.3.4/host.conf
-
-       must_exist /$(get_libdir)/ libpthread.so.0
 }
 
 must_exist() {