From: Fabian Groffen Date: Fri, 12 Mar 2010 12:06:25 +0000 (+0000) Subject: Update libstdc++ version check to exclude 64-bits builds on Leopard, dtrace is 32... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43dd3bf0b27087404adecefc010af4d5affa9db4;p=gentoo.git Update libstdc++ version check to exclude 64-bits builds on Leopard, dtrace is 32-bits only there. Package-Manager: portage-2.2.00.15754-prefix/cvs/SunOS i386 --- diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog index 4bb5452284d9..da67cd616650 100644 --- a/sys-devel/gcc-apple/ChangeLog +++ b/sys-devel/gcc-apple/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-devel/gcc-apple # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.12 2010/03/09 17:53:25 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.13 2010/03/12 12:06:25 grobian Exp $ + + 12 Mar 2010; Fabian Groffen + gcc-apple-4.2.1_p5646.ebuild, gcc-apple-4.2.1_p5647.ebuild: + Update libstdc++ version check to exclude 64-bits builds on Leopard, + dtrace is 32-bits only there. 09 Mar 2010; Fabian Groffen gcc-apple-4.2.1_p5566-r2.ebuild, gcc-apple-4.2.1_p5574.ebuild, diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest index 152cced2da61..4dc5b2a47b57 100644 --- a/sys-devel/gcc-apple/Manifest +++ b/sys-devel/gcc-apple/Manifest @@ -23,7 +23,7 @@ EBUILD gcc-apple-4.0.1_p5490-r2.ebuild 8530 RMD160 43f321eda46adab01c0aa8b39e9c2 EBUILD gcc-apple-4.0.1_p5493.ebuild 8542 RMD160 e53dadf5d96ca4bb89494ed0f032e1dbfb8667bb SHA1 5470dcd599e434572a00e860c86e0212fa3707a6 SHA256 014c6b7d8737be6efcecb2ac533881cb2cacb932e3a0af8de683e4974ce08c32 EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10763 RMD160 452b7b40768c8ff31ea5b8169d5ef68211e8c8d3 SHA1 6a2a925eea790840cd01b374a44b806485722ff1 SHA256 2040615b97abee9917e95ee7cd2764242bedabb05180c7b7c999ecf7aa703457 EBUILD gcc-apple-4.2.1_p5574.ebuild 10777 RMD160 b70aad820c70cdc808baa4e2345e82bf5532f5a0 SHA1 d233cd182e11be54cb087daa1bd2003d59f2389f SHA256 12658a729831f0f94553053a57d529fefb8db2f56e3e56d5d3b1eb2a237df651 -EBUILD gcc-apple-4.2.1_p5646.ebuild 11223 RMD160 e89084a0e7c4c000ac43bc675abf0bebeb644e59 SHA1 15aac674c442c3f0fb3e4cca2fe074a4b03ab43f SHA256 31821b842f6a275889314c017b76dca2811075c5aa27005a0a57a8f595af3d42 -EBUILD gcc-apple-4.2.1_p5647.ebuild 11263 RMD160 e060f24b53d3b75e539ba57407e3f41fb7a2c157 SHA1 4d3033a768d15f1e6ae1ee0a0350c42e7cb29e86 SHA256 c448bc69cf55f2a4cbdb4688418a7b2cf2428109e1312680d35728fba0d1a77e -MISC ChangeLog 10847 RMD160 aceebb113c49c1509ce4f1db9ae67cb1c446aa33 SHA1 4bbe57182bf3c14372a6d97c6aa8709e4d8a320d SHA256 c22ab6b0bfadfc7d0e5ccc3a031044de368df869fcf4ca0e792a304c53e18505 +EBUILD gcc-apple-4.2.1_p5646.ebuild 11263 RMD160 e7a4eae3d6d251a79f71fb3bbde680ac19da7866 SHA1 d362bd9f07b86e686e971cf1ecd5f1965a70fbb1 SHA256 0c65a42c310c29b6e3f8e51e418d521a8606d89029b4efcbecf9b5fd3688720b +EBUILD gcc-apple-4.2.1_p5647.ebuild 11303 RMD160 d14b4fcf506b3d296ef61b44a7ec09396ab27e9c SHA1 96b2788d6e945761d485fa68d421824cdef7c41a SHA256 334962f35dc7a5e7b9977dc5f1db4378b1e5c8a3fa2ca6e315a71ffdac10cb13 +MISC ChangeLog 11064 RMD160 f05e2683fb76230682a7a39f5e97610a2abfe98f SHA1 19194baf5c36e3559f121f68b93a127270c86435 SHA256 3609069cd8147a4a1dd1a26e0153836506deae27d60a053162c20dbd1ea24094 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517 diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild index 357204e7d851..8a0739b22060 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild,v 1.4 2010/03/09 17:53:25 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild,v 1.5 2010/03/12 12:06:25 grobian Exp $ EAPI="3" @@ -18,12 +18,16 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE fortran? ( mirror://gnu/gcc/gcc-${GCC_VERS}/gcc-fortran-${GCC_VERS}.tar.bz2 )" LICENSE="GPL-2" -if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then - LIBSTDCXX_APPLE_VERSION=39 -else - # pre Leopard has no dtrace, which is required by 37.11 and above - LIBSTDCXX_APPLE_VERSION=16 -fi +case ${CHOST} in + *-darwin1*|i?86-*darwin9) + LIBSTDCXX_APPLE_VERSION=39 + ;; + *) + # pre Leopard has no dtrace, which is required by 37.11 and above + # Leopard only has 32-bits version of dtrace + LIBSTDCXX_APPLE_VERSION=16 + ;; +esac if is_crosscompile; then SLOT="${CTARGET}-42" diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild index 45da26ca839c..b32519489d4c 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.3 2010/03/09 17:53:25 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.4 2010/03/12 12:06:25 grobian Exp $ EAPI="3" @@ -18,12 +18,16 @@ SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-${APPLE fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )" LICENSE="GPL-2 GPL-3" -if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -ge 9 ]] ; then - LIBSTDCXX_APPLE_VERSION=39 -else - # pre Leopard has no dtrace, which is required by 37.11 and above - LIBSTDCXX_APPLE_VERSION=16 -fi +case ${CHOST} in + *-darwin1*|i?86-*darwin9) + LIBSTDCXX_APPLE_VERSION=39 + ;; + *) + # pre Leopard has no dtrace, which is required by 37.11 and above + # Leopard only has 32-bits version of dtrace + LIBSTDCXX_APPLE_VERSION=16 + ;; +esac if is_crosscompile; then SLOT="${CTARGET}-42"