summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2009-12-08 17:16:13 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2009-12-08 17:16:13 +0000
commit8c33c86fe555e107661fce72bd9a2f58df936fe0 (patch)
tree029331b77151bffc1a403e2e3ebd4f02b640f0a7 /sci-physics/cernlib
parentMarking pybugz-0.8.0 ppc64 for bug 289863 (diff)
downloadhistorical-8c33c86fe555e107661fce72bd9a2f58df936fe0.tar.gz
historical-8c33c86fe555e107661fce72bd9a2f58df936fe0.tar.bz2
historical-8c33c86fe555e107661fce72bd9a2f58df936fe0.zip
Respect user's compiler commands, thanks to jer, bug #296058
Package-Manager: portage-2.2_rc55/cvs/Linux x86_64
Diffstat (limited to 'sci-physics/cernlib')
-rw-r--r--sci-physics/cernlib/ChangeLog6
-rw-r--r--sci-physics/cernlib/Manifest10
-rw-r--r--sci-physics/cernlib/cernlib-2006-r3.ebuild5
3 files changed, 14 insertions, 7 deletions
diff --git a/sci-physics/cernlib/ChangeLog b/sci-physics/cernlib/ChangeLog
index bfcfe789612b..764518e1552a 100644
--- a/sci-physics/cernlib/ChangeLog
+++ b/sci-physics/cernlib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-physics/cernlib
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.19 2009/12/04 19:35:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/ChangeLog,v 1.20 2009/12/08 17:16:13 bicatali Exp $
+
+ 08 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+ cernlib-2006-r3.ebuild:
+ Respect user's compiler commands, thanks to jer, bug #296058
04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
cernlib-2006-r3.ebuild:
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index d0f2d42b2ff4..d3fcbff1f3ed 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -8,14 +8,14 @@ AUX cernlib-2006-testlink.patch 872 RMD160 be7a785e35181ff556804ef58362b8497d510
DIST cernlib_2006.dfsg.2-14.diff.gz 191345 RMD160 e2c6180b76855b33eb637878157722803c046119 SHA1 1d3c1e5300227eda76ea41672d0dc1675003d578 SHA256 e58c84825ea6fc775acdbccbaaa7ac8c3b70120da8f99e704270ea0aa437e665
DIST cernlib_2006.dfsg.2-2.diff.gz 167199 RMD160 2772f85fc4e8891e2729f57b35b24b1dd78de82d SHA1 ab4cf56fc7cd9bc2768a85128521a1b168c95ebe SHA256 40e2996e61f7b30dbedb1c525755a2e64df26e4878cce36f5f458229306dedb7
DIST cernlib_2006.dfsg.2.orig.tar.gz 6152834 RMD160 a75f320a2568eb3942268e7b03525a045e324b70 SHA1 181fef4381d49a2e40a8f21550c3cef0dbaa4dd9 SHA256 f8ef612cdef0e02b69ccabbe0061eed5f952522565affc25e8ad6e0b73b73f26
-EBUILD cernlib-2006-r3.ebuild 3068 RMD160 a8bead1aa926630e09a29cb706522318787adad4 SHA1 86bb618636a24742243271fccf28b8196d7a2c76 SHA256 e89fb36f4dc1d331c56c33bcaf5eec3dacef6100ad289d506d271740975402a3
+EBUILD cernlib-2006-r3.ebuild 3242 RMD160 0ca7d23dce01ea0f1f17c540b61ab2546ae68e73 SHA1 c845ea4fb8ba5aad90eaf14bc785897b4c6b33cc SHA256 1ea3f90f1de1ef456694a1aa6712b8e322f055e24f4fc5e462d32bb9de8f019b
EBUILD cernlib-2006.ebuild 3918 RMD160 9dafabb7ef29efe9c71290476a78b0c6b84ac620 SHA1 7ab894926502460b3bf6ffe4ef5378dabc906ee7 SHA256 23f801963e9411fb6c22c8c95d3b506b0e36ae24df838fdc8e1835b98e6a8568
-MISC ChangeLog 3205 RMD160 1a0d96eff5c210111321d6e90b6317d8a50de4f9 SHA1 85629f13339460fb3ea1b60dd65448e53001101d SHA256 1e7530de6ec252f190ad7fdbb6daddaac1ca1b469ee4f472fb2100a4d0a6625b
+MISC ChangeLog 3350 RMD160 2591a83013f1065416ba03be26d6a55fbaa45326 SHA1 0e497bab8eb271629d5b28508c7a3354cb9f266c SHA256 330f4bd4b8d7e7b1fd84490f7236a79c0330cdf191dc1f0dac615fa244fb4b59
MISC metadata.xml 654 RMD160 a33df2636030f2653d4bf478451979fc9850dc85 SHA1 7b018c6bb2eb2b897cd4a60b3a6080995094f44a SHA256 9812f051c9ac5c19fd295cdf79d9ba9d799a7b5ebe6b10d4cf9428d1ebf4e32c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.13 (GNU/Linux)
-iEYEARECAAYFAksZbc4ACgkQ1ycZbhPLE2Dr1QCeOPXSTOtEazWlGJCVnH7iMIiG
-T7YAoKtlPLI0V07mdHBDnN9D3mTKm1d8
-=g8fK
+iEYEARECAAYFAksekzAACgkQ1ycZbhPLE2BdSgCgrs1yO800uLjgIbBTEr1xrqvy
+2dcAn2eMt4rhB/EnflXy/4aQNvv0l4JR
+=6UTe
-----END PGP SIGNATURE-----
diff --git a/sci-physics/cernlib/cernlib-2006-r3.ebuild b/sci-physics/cernlib/cernlib-2006-r3.ebuild
index c018149943dd..1cdd1bd003d4 100644
--- a/sci-physics/cernlib/cernlib-2006-r3.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r3.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/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.5 2009/12/04 19:35:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/cernlib/cernlib-2006-r3.ebuild,v 1.6 2009/12/08 17:16:13 bicatali Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -68,6 +68,9 @@ src_prepare() {
sed -i \
-e 's/-O3/-O2/g' \
-e "s/-O2/${CFLAGS}/g" \
+ -e "s|\(CcCmd[[:space:]]*\)gcc|\1$(tc-getCC)|g" \
+ -e "s|\(CplusplusCmd[[:space:]]*\)g++|\1$(tc-getCXX)|g" \
+ -e "s|\(FortranCmd[[:space:]]*\)gfortran|\1$(tc-getFC)|g" \
src/config/linux.cf \
|| die "sed linux.cf failed"
sed -i \