Fix from upstream for missing symbol versions in multilib builds #304239.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

3 files changed, 196 insertions, 3 deletions

diff --git a/sys-libs/libstdc++-v3/ChangeLog b/sys-libs/libstdc++-v3/ChangeLog
index 6f423870574b..b200fe36fc87 100644
--- a/sys-libs/libstdc++-v3/ChangeLog
+++ b/sys-libs/libstdc++-v3/ChangeLog
@@ -1,6 +1,12 @@
 # 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.62 2009/10/23 19:31:08 gengor Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libstdc++-v3/ChangeLog,v 1.63 2011/06/09 16:58:06 vapier Exp $
+
+*libstdc++-v3-3.3.6-r1 (09 Jun 2011)
+
+  09 Jun 2011; Mike Frysinger <vapier@gentoo.org>
+  +libstdc++-v3-3.3.6-r1.ebuild:
+  Fix from upstream for missing symbol versions in multilib builds #304239.
 
   23 Oct 2009; Gordon Malm <gengor@gentoo.org> libstdc++-v3-3.3.6.ebuild:
   filter-flags -fstrict-overflow too, bug #290202
diff --git a/sys-libs/libstdc++-v3/Manifest b/sys-libs/libstdc++-v3/Manifest
index 4ce441a0861e..08e3de7a7d41 100644
--- a/sys-libs/libstdc++-v3/Manifest
+++ b/sys-libs/libstdc++-v3/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST gcc-3.3.6-patches-1.6.tar.bz2 48814 RMD160 3f25b67015c6e4d874690c48d23292a670501e0c SHA1 aba4661d50787aad26849497d45194804bf21b73 SHA256 c692f8f00d16947e13dd86ca974e419c35d1befee9ee915fa6c50a741487ef63
+DIST gcc-3.3.6-patches-1.7.tar.bz2 50642 RMD160 f602f30a7a2444fbac667d756ef301723ba5e556 SHA1 d840d27e40c39cb572ac42f33de340a09c61f912 SHA256 bdcf002b324497d0ad2344bf914cf00f6f4200b37c6304ed7a44fdd0f9b4c2fc
 DIST gcc-3.3.6.tar.bz2 23972413 RMD160 b32c7a08c690857f0ac52dda3deb47cf5775d967 SHA1 2cc43978bb09af6c2ccfdf74797d10d7cc2596fb SHA256 1c1aa533c67e9da5e55ed4f5736258dc753466bd716bdae3fb88fb66e6ff1d7f
+EBUILD libstdc++-v3-3.3.6-r1.ebuild 4795 RMD160 5d77064f1d97f9546d1ee4383e5626cc7f98d92d SHA1 f802b8b9db3540d5121bc4836495ca546ec915e0 SHA256 ee456ebdf81aecacc15038c54e84a9d1963ab92fa8da2bb879af6ec708e4cc3c
 EBUILD libstdc++-v3-3.3.6.ebuild 4788 RMD160 660e661a5542b7d156f8aa2ad7bee9b249afeafa SHA1 d32fbc2b1af9f605804c3197ed23fb88cb128308 SHA256 4c7cb2a6c94fa79cfe285473a6360b116bcf5e4892052ba7aabe72abf0be78ce
-MISC ChangeLog 9276 RMD160 8aa37cdb44360ca5a915e6e7b46e2a6ce9b03504 SHA1 148daa41ea427cc5708ff0c2d2b878cce349c332 SHA256 b70f2498136599eb2fdbc86cb663115ad76d38253d7fa73a2a19900805de9c75
+MISC ChangeLog 9474 RMD160 7c5ba39ce8d24c4e933c1314e39efd6543fb026f SHA1 715f8e5d8b7ea1cd7f71932a71520fcbcd01538e SHA256 a9ac16f0e7161a16d8ddcac9e5715e0da3e68f6502276e9bb632a3707e1afc93
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF0EAREIAAYFAk3w+6UACgkQaC/OocHi7JYV5AD/WwIMateJxul62EFUyMbZRy/z
+vwE7brBxY4YbW20tjPwA916iqtLOK3g1mvzVHfMHm5mqWOQWLK4wLogHAHCua5s=
+=xQ9H
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
new file mode 100644
index 000000000000..fbfee70239ab
--- /dev/null
+++ b/sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/06/09 16:58:06 vapier Exp $
+
+inherit eutils flag-o-matic libtool multilib
+
+transform_known_flags() {
+	declare setting
+
+	# and on x86, we just need to filter the 3.4 specific amd64 -marchs
+	replace-cpu-flags k8 athlon64 opteron x86-64
+
+	# gcc 3.3 doesn't support -march=pentium-m
+	replace-cpu-flags pentium-m pentium3m pentium3
+
+	#GCC 3.3 does not understand G3, G4, G5 on ppc
+	replace-cpu-flags G3 750
+	replace-cpu-flags G4 7400
+	replace-cpu-flags G5 7400
+}
+
+is_arch_allowed() {
+	i386_processor_table="i386 i486 i586 pentium pentium-mmx winchip-c6 \
+		winchip2 c3 i686 pentiumpro pentium2 pentium3 pentium4 prescott \
+		nocona k6 k6-2 k6-3 athlon athlon-tbird x86-64 athlon-4 athlon-xp \
+		athlon-mp"
+
+	for proc in ${i386_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+	mips_processor_table="mips1 mips2 mips3 mips4 mips32 mips64 r3000 r2000 \
+		r3900 r6000 r4000 vr4100 vr4111 vr4120 vr4300 r4400 r4600 orion \
+		r4650 r8000 vr5000 vr5400 vr5500 4kc 4kp 5kc 20kc sr71000 sb1"
+
+	for proc in ${mips_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+	rs6000_processor_table="common power power2 power3 power4 powerpc \
+		powerpc64 rios rios1 rsc rsc1 rios2 rs64a 401 403 405 505 601 602 \
+		603 603e ec603e 604 604e 620 630 740 750 7400 7450 8540 801 821 823 \
+		860"
+
+	for proc in ${rs6000_processor_table} ; do
+		[ "${proc}" == "${1}" ] && return 0
+	done
+
+	return 1
+}
+
+do_filter_flags() {
+	declare setting
+
+	# In general gcc does not like optimization, and add -O2 where
+	# it is safe.  This is especially true for gcc 3.3 + 3.4
+	replace-flags -O? -O2
+
+	# gcc 3.3 doesn't support -mtune on numerous archs, so xgcc will fail
+	setting="`get-flag mtune`"
+	[ ! -z "${setting}" ] && filter-flags -mtune="${setting}"
+
+	# in gcc 3.3 there is a bug on ppc64 where if -mcpu is used
+	# the compiler incorrectly assumes the code you are about to build
+	# is 32 bit
+	use ppc64 && setting="`get-flag mcpu`"
+	[ ! -z "${setting}" ] && filter-flags -mcpu="${setting}"
+
+	# only allow the flags that we -know- are supported
+	transform_known_flags
+	setting="`get-flag march`"
+	if [ ! -z "${setting}" ] ; then
+		is_arch_allowed "${setting}" || filter-flags -march="${setting}"
+	fi
+	setting="`get-flag mcpu`"
+	if [ ! -z "${setting}" ] ; then
+		is_arch_allowed "${setting}" || filter-flags -mcpu="${setting}"
+	fi
+
+	# xgcc wont understand gcc 3.4 flags...
+	filter-flags -fno-unit-at-a-time
+	filter-flags -funit-at-a-time
+	filter-flags -fweb
+	filter-flags -fno-web
+	filter-flags -mno-tls-direct-seg-refs
+
+	# xgcc isnt patched with propolice
+	filter-flags -fstack-protector-all
+	filter-flags -fno-stack-protector-all
+	filter-flags -fstack-protector
+	filter-flags -fno-stack-protector
+
+	# xgcc isnt patched with the gcc symbol visibility patch
+	filter-flags -fvisibility-inlines-hidden
+	filter-flags -fvisibility=hidden
+
+	# Bug #269433 & #290202
+	filter-flags -fno-strict-overflow
+	filter-flags -fstrict-overflow
+
+	# ...sure, why not?
+	strip-unsupported-flags
+
+	strip-flags
+}
+
+PATCH_VER="1.7"
+
+DESCRIPTION="Compatibility package for running binaries linked against a pre gcc 3.4 libstdc++"
+HOMEPAGE="http://gcc.gnu.org/libstdc++/"
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-${PV}.tar.bz2
+	mirror://gentoo/gcc-${PV}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc -ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="multilib nls"
+
+S=${WORKDIR}/gcc-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+	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() {
+	cd "${WORKDIR}"/build
+	do_filter_flags
+	ECONF_SOURCE=${S}
+	econf \
+		--enable-shared \
+		--with-system-zlib \
+		--enable-languages=c++ \
+		--enable-threads=posix \
+		--enable-long-long \
+		--disable-checking \
+		--enable-cstdio=stdio \
+		--enable-__cxa_atexit \
+		$(use_enable multilib) \
+		$(use_enable nls) \
+		$(use_with !nls included-gettext) \
+		|| die
+
+	touch "${S}"/gcc/c-gperf.h
+
+	emake all-target-libstdc++-v3 || die
+}
+
+src_install() {
+	emake -j1 \
+		-C "${WORKDIR}"/build \
+		DESTDIR="${D}" \
+		install-target-libstdc++-v3 || die
+
+	# scrub everything but the library we care about
+	pushd "${D}" >/dev/null
+	mv usr/lib* . || die
+	rm -rf usr
+	rm -f lib*/*.{a,la,so} || die
+	dodir /usr
+	mv lib* usr/ || die
+}