diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2005-06-04 12:33:26 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2005-06-04 12:33:26 +0000 |
| commit | fb4c3f12887570a2b02f161a1eaca7d7821a5c2b (patch) | |
| tree | a81b2dcd7d2f437f1f9edefb722a3e9e0fc8e3a9 /sys-libs/libstdc++-v3 | |
| parent | add /etc/socks/sock?.conf; add sockd user; improve init script (diff) | |
| download | historical-fb4c3f12887570a2b02f161a1eaca7d7821a5c2b.tar.gz historical-fb4c3f12887570a2b02f161a1eaca7d7821a5c2b.tar.bz2 historical-fb4c3f12887570a2b02f161a1eaca7d7821a5c2b.zip | |
Fixed multilib handling.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'sys-libs/libstdc++-v3')
| -rw-r--r-- | sys-libs/libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/libstdc++-v3/Manifest | 16 | ||||
| -rw-r--r-- | sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild | 13 |
3 files changed, 28 insertions, 8 deletions
diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog index 6169d2f227b7..8d9076d08687 100644 --- a/sys-libs/libstdc++-v3/ChangeLog +++ b/sys-libs/libstdc++-v3/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/libstdc++-v3 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.32 2005/05/11 10:33:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.33 2005/06/04 12:33:26 kugelfang Exp $ + + 04 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> + libstdc++-v3-3.3.4.ebuild: + Fixed multilib handling, both triggers (has_multilib_profile) and + directories (lib64 instead lib). 11 May 2005; Diego Pettenò <flameeyes@gentoo.org> libstdc++-v3-3.3.4.ebuild: diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest index de831f57468f..5d04b13a81bc 100644 --- a/sys-libs/libstdc++-v3/Manifest +++ b/sys-libs/libstdc++-v3/Manifest @@ -1,7 +1,17 @@ -MD5 b1eca3b48e42e3f33f910f02480405c6 ChangeLog 5128 -MD5 b6c1db1060c4e856b248a22adec1ff53 metadata.xml 220 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 306171ec37f5e7736e86d9cb935343d8 ChangeLog 5313 MD5 1d10a1aa979ad2a8d533f48d9a1d865b libstdc++-v3-3.3.3-r1.ebuild 7853 -MD5 00c52c7af395c1f7d2db69c310bc9edb libstdc++-v3-3.3.4.ebuild 8098 +MD5 b6c1db1060c4e856b248a22adec1ff53 metadata.xml 220 +MD5 867e9ec885445718691c9219a9c98f93 libstdc++-v3-3.3.4.ebuild 8256 MD5 14f4d6619c938dbb907e2420c0eeefd9 files/digest-libstdc++-v3-3.3.3-r1 64 MD5 b2a96584f4cee72362695ba44c911c40 files/libstdc++_amd64_multilib_hack.patch 350 MD5 4068b84d9ce9d440b063718549cfc354 files/digest-libstdc++-v3-3.3.4 64 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFCoaFA5mJXAu5GbtIRAkMHAJsFU1E9YissKO/60cwyYQy2Cnw7RgCfQ9bg +LCWUAxWhOhK8Et0uVYucS4M= +=3GDt +-----END PGP SIGNATURE----- diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild index 2025189446ac..1a72472a21b5 100644 --- a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild +++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.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/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.13 2005/05/24 05:10:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/libstdc++-v3-3.3.4.ebuild,v 1.14 2005/06/04 12:33:26 kugelfang Exp $ inherit eutils flag-o-matic libtool gnuconfig versionator @@ -130,7 +130,7 @@ HOMEPAGE="http://gcc.gnu.org/libstdc++/" LICENSE="GPL-2 LGPL-2.1" KEYWORDS="amd64 ~x86 ~mips ppc64 ppc ~sparc" -IUSE="nls" +IUSE="nls multilib" # 3.2.3 -> 3.3.x install .so.5, so lets slot to 5 if [ "${CHOST}" == "${CCHOST}" ] @@ -165,7 +165,12 @@ src_unpack() { # Fixup libtool to correctly generate .la files with portage elibtoolize --portage --shallow - use amd64 && epatch ${FILESDIR}/libstdc++_amd64_multilib_hack.patch + if (has_multilib_profile || use multilib) ; then + sed -i \ + -e 's:\(MULTILIB_OSDIRNAMES = \).*:\1../lib64 ../lib32:' \ + ${S}/gcc/config/i386/t-linux64 \ + || die "sed failed!" + fi # Misdesign in libstdc++ (Redhat) cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h @@ -185,7 +190,7 @@ src_compile() { myconf="${myconf} --enable-nls --without-included-gettext" fi - use amd64 && myconf="${myconf} --disable-multilib" + (has_multlib_profile || use multilib) || myconf="${myconf} --disable-multilib" do_filter_flags einfo "CFLAGS=\"${CFLAGS}\"" |