diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-06-02 21:21:02 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-06-02 21:21:02 +0000 |
| commit | 85e67ae989c1856c2d3c832c2e2d3981f61c8e7c (patch) | |
| tree | aff136947af7bf8f924a59627b84b00ad71560a7 /sys-devel | |
| parent | Added to ~ppc (diff) | |
| download | historical-85e67ae989c1856c2d3c832c2e2d3981f61c8e7c.tar.gz historical-85e67ae989c1856c2d3c832c2e2d3981f61c8e7c.tar.bz2 historical-85e67ae989c1856c2d3c832c2e2d3981f61c8e7c.zip | |
lib64 fix for libgcc_s on ppc64
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/gcc/Manifest | 4 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.4.0-r6.ebuild | 10 |
3 files changed, 14 insertions, 5 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index cf5362c06a3a..2681bf9a2fd2 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/gcc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.259 2004/06/02 11:01:46 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.260 2004/06/02 21:21:02 lv Exp $ + + 02 Jun 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r6.ebuild: + lib64 fix for libgcc_s on ppc64 02 Jun 2004; Joshua Kinard <kumba@gentoo.org> gcc-3.4.0-r6.ebuild: Added ~mips back to KEYWORDS. diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 6752c4951212..fda17ca158f0 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -16,14 +16,14 @@ MD5 6f4b970b6e64b99a49d7c2ac35817d38 gcc-3.3.3.ebuild 22398 MD5 bd281971d3658dd49f02f647b97c4eeb gcc-3.3.1-r5.ebuild 18002 MD5 b6a375116a668edbe10b2ac2e1f9fc6d gcc-3.0.4-r6.ebuild 8577 MD5 9788cb185cfaeecac7c683d7fd7d58d2 gcc-3.3.3-r6.ebuild 25262 -MD5 3f98298b7c35df541e667460e06a59b5 gcc-3.4.0-r6.ebuild 29084 +MD5 f2884b95d67418c13ad90faf92c6192e gcc-3.4.0-r6.ebuild 29143 MD5 68da62e17a31058a92822721b553eca9 gcc-3.1.1-r1.ebuild 9424 MD5 14cf69f1206d85356781dd2ad63eb7ca gcc-3.3.2-r4.ebuild 20741 MD5 c7e55fc7f4bfd637f45786c0c5fbb365 gcc-2.95.3-r8.ebuild 9095 MD5 b5f1d4d71ad38c5c5e489466ac0ad399 gcc-3.3.3-r3.ebuild 24690 MD5 9fb6a5505f97c736a3f40f84ea9c71da gcc-3.3.2-r6.ebuild 21217 MD5 e6ead3ed008a1fe7adc73ddae996ade3 gcc-3.3.2-r1.ebuild 17965 -MD5 840c0bd4c5e06fedc4470ea4e4122677 ChangeLog 54343 +MD5 2d8089275b6aee7c05dfd978e3c78c4e ChangeLog 54444 MD5 f00b83c775e21267dcfc5c57412dc961 gcc-3.3.2.ebuild 17908 MD5 3b2fd4637666e71aae9954782cd23016 gcc-3.3.3_pre20040426.ebuild 22633 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 diff --git a/sys-devel/gcc/gcc-3.4.0-r6.ebuild b/sys-devel/gcc/gcc-3.4.0-r6.ebuild index 904f88793915..cde09d89ed6a 100644 --- a/sys-devel/gcc/gcc-3.4.0-r6.ebuild +++ b/sys-devel/gcc/gcc-3.4.0-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r6.ebuild,v 1.4 2004/06/02 11:01:46 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r6.ebuild,v 1.5 2004/06/02 21:21:02 lv Exp $ IUSE="static nls bootstrap java build X multilib gcj f77 objc pic hardened uclibc n32 n64" @@ -180,6 +180,12 @@ RDEPEND="virtual/glibc PDEPEND="sys-devel/gcc-config" +has_lib64() { + use amd64 && return 0 + use ppc64 && return 0 + return 1 +} + chk_gcc_version() { # This next bit is for updating libtool linker scripts ... local OLD_GCC_VERSION="`gcc -dumpversion`" @@ -850,7 +856,7 @@ src_install() { exeinto /sbin doexe ${FILESDIR}/fix_libtool_files.sh - if [ "${ARCH}" = "amd64" ] + if has_lib64 then # GCC 3.4 tries to place libgcc_s in lib64, where it will never be # found. When multilib is enabled, it also places the 32bit version in |