summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-17 03:28:06 +0000
committerMike Frysinger <vapier@gentoo.org>2009-02-17 03:28:06 +0000
commitf4c71fb0ec42bda6b37677e865ac1c1aea15fb8d (patch)
tree4729cd2754a36678c7592327f182573a7ee1bcbe /sys-libs/libstdc++-v3
parentversion bump with fix for bug #253712 as well (diff)
downloadhistorical-f4c71fb0ec42bda6b37677e865ac1c1aea15fb8d.tar.gz
historical-f4c71fb0ec42bda6b37677e865ac1c1aea15fb8d.tar.bz2
historical-f4c71fb0ec42bda6b37677e865ac1c1aea15fb8d.zip
Restore USE=multilib crap #259215.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'sys-libs/libstdc++-v3')
-rw-r--r--sys-libs/libstdc++-v3/ChangeLog5
-rw-r--r--sys-libs/libstdc++-v3/Manifest10
-rw-r--r--sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild11
3 files changed, 19 insertions, 7 deletions
diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog
index 2bf5a4dcae95..13802e6b2cea 100644
--- a/sys-libs/libstdc++-v3/ChangeLog
+++ b/sys-libs/libstdc++-v3/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/libstdc++-v3
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.59 2009/02/16 23:38:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.60 2009/02/17 03:28:06 vapier Exp $
+
+ 17 Feb 2009; Mike Frysinger <vapier@gentoo.org> libstdc++-v3-3.3.6.ebuild:
+ Restore USE=multilib crap #259215.
16 Feb 2009; Mike Frysinger <vapier@gentoo.org> libstdc++-v3-3.3.6.ebuild:
Restore out-of-tree building #259192 by Martin von Gagern.
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index 519b49e1ad1b..6617ced971ad 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
DIST gcc-3.3.6-patches-1.6.tar.bz2 48814 RMD160 3f25b67015c6e4d874690c48d23292a670501e0c SHA1 aba4661d50787aad26849497d45194804bf21b73 SHA256 c692f8f00d16947e13dd86ca974e419c35d1befee9ee915fa6c50a741487ef63
DIST gcc-3.3.6.tar.bz2 23972413 RMD160 b32c7a08c690857f0ac52dda3deb47cf5775d967 SHA1 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f
-EBUILD libstdc++-v3-3.3.6.ebuild 4435 RMD160 df399e03b426cbfe5ecd18192002c4cfbdb93f5f SHA1 e9d95b93f9c5e08ae751f705da4627d00fcbc477 SHA256 7cd93179d98a15ebccc47b5dc72d6faf6a6101b4f73cc97fde7f4fff43a072c1
-MISC ChangeLog 8918 RMD160 97a53c3c1fdbec361403a7c10fc9e006b5918f7e SHA1 441238da42659366a6004db969bff7271b0897de SHA256 9d694b8b3bb79eddf32eb2de58a7d2da6c3a256e05a969749f9dbdf5501d732c
+EBUILD libstdc++-v3-3.3.6.ebuild 4695 RMD160 0e7407a766f7648c227fd0dcb645d491a28619c8 SHA1 9c6ec6c2b6ab466beeb5a32c6aa641cd684d56ab SHA256 2c724d197ccf51bb26a0e0d549299b9aa42c93737f43388b7c6e05a61a83a509
+MISC ChangeLog 9033 RMD160 4a9c940783eae5b09601c425a7a2776c3314ebba SHA1 d7c70eeb693bede965a11a26c332522b9ff6f3e3 SHA256 fe1ab4fbd2c502eaeffce5ddf7d9f856ca18b36d4ffe1a3e25d172240ba78c97
MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkmZ+Q0ACgkQn/5bYzqsSmF6dwCeKOKz4mWESZWoJE+AgC1QirpU
-o38An3BuNTnggWMfCWrOj0MGR2jDK5Ty
-=MMb1
+iEYEARECAAYFAkmaLswACgkQn/5bYzqsSmGyvACeOAiCy4P/Xeouo8VOGugh6Ffl
+ygMAnictcbi3OhYcpiiM2JJo2kI15K9B
+=qcrf
-----END PGP SIGNATURE-----
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
index a1c8de807cbe..027b3765df25 100644
--- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.23 2009/02/16 23:38:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild,v 1.24 2009/02/17 03:28:06 vapier Exp $
inherit eutils flag-o-matic libtool multilib
@@ -121,6 +121,15 @@ src_unpack() {
elibtoolize --portage --shallow
./contrib/gcc_update --touch
mkdir -p "${WORKDIR}"/build
+
+ if use multilib ; then
+ # ugh, this shit has to match the way we've hacked gcc else
+ # the build falls apart #259215
+ sed -i \
+ -e 's:\(MULTILIB_OSDIRNAMES = \).*:\1../lib64 ../lib32:' \
+ "${S}"/gcc/config/i386/t-linux64 \
+ || die "sed failed!"
+ fi
}
src_compile() {