diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-12-17 08:24:38 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-12-17 08:24:38 +0000 |
commit | 3585d314d0c1765812b2e5a6457b6cc231552350 (patch) | |
tree | bc017656a758d77ceb02e8af9294782e80f15417 /sci-libs | |
parent | Fix for fortran.eclass removal (diff) | |
download | historical-3585d314d0c1765812b2e5a6457b6cc231552350.tar.gz historical-3585d314d0c1765812b2e5a6457b6cc231552350.tar.bz2 historical-3585d314d0c1765812b2e5a6457b6cc231552350.zip |
Fix for fortran.eclass removal
Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/mkl/ChangeLog | 6 | ||||
-rw-r--r-- | sci-libs/mkl/Manifest | 18 | ||||
-rw-r--r-- | sci-libs/mkl/mkl-10.0.2.018-r2.ebuild | 21 | ||||
-rw-r--r-- | sci-libs/mkl/mkl-10.0.5.025.ebuild | 22 | ||||
-rw-r--r-- | sci-libs/mkl/mkl-9.1.023.ebuild | 20 |
5 files changed, 68 insertions, 19 deletions
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog index 8d9ca7a4b31d..2a36898c11f3 100644 --- a/sci-libs/mkl/ChangeLog +++ b/sci-libs/mkl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/mkl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.39 2010/12/16 15:47:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.40 2010/12/17 08:24:38 jlec Exp $ + + 17 Dec 2010; Justin Lecher <jlec@gentoo.org> mkl-9.1.023.ebuild, + mkl-10.0.2.018-r2.ebuild, mkl-10.0.5.025.ebuild: + Fix for fortran.eclass removal 16 Dec 2010; Justin Lecher <jlec@gentoo.org> mkl-9.1.023.ebuild, mkl-10.0.2.018-r2.ebuild, mkl-10.0.5.025.ebuild: diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest index e8682fa093bb..c93fcb782751 100644 --- a/sci-libs/mkl/Manifest +++ b/sci-libs/mkl/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX blas.pc.in 288 RMD160 f4398c1cdebed7dbbf881b1aa55ee9c638526110 SHA1 11212030183e53093043c5ed8fa0b048600e5054 SHA256 94eb01ae01b2d77e6961501cc12013c38324747226bb6857016a2f3af7858275 AUX cblas.pc.in 306 RMD160 ec34e5cfc9a60064bfa9cf14a4acabb78a6d709c SHA1 a91c8e40ac4696e102a5040bd6a1a4f7e306b2c3 SHA256 ab5066a967f2d75aa3c16447940413d05f02b1ed82da06b94aa5982da6d4d90a AUX lapack.pc.in 297 RMD160 2e0c015255711fc6f166402787f449c081fffbb0 SHA1 9ab6b431665345c1d80fc9cb998f8c6c18bea1a9 SHA256 b158edeef6796fb84c40b3d6d483144e655139d6cf92f8a738d1765ddaaa0b80 @@ -7,8 +10,15 @@ DIST l_mkl_enh_p_9.1.023.tgz 316915220 RMD160 afdcb8ef28053e9ee5b1a3f8b9e6126c58 DIST l_mkl_p_10.0.2.018.tgz 227440983 RMD160 0c28416597ef917328193fa0c6403d7c0e7b971d SHA1 1aa8c47701b142ab52ebcda27fdda4c5d0903471 SHA256 311d2885a33d553a2d1b1370eed1e3e9bccc246f2dcd20e3558ed492443ba20f DIST l_mkl_p_10.0.5.025.tgz 230389719 RMD160 b961c3ce36795b3aae2d22badbcf1bbb5bd29d63 SHA1 a052b3ad6163dab7a29911eb408ca6577507f492 SHA256 c98f2c5c652c02ac7200cba40d996b1f11b567278d849016b7ee3b0320e26e3c DIST l_mkl_p_9.1.023.tgz 155907883 RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad SHA1 52693b9aca15d43a890af92e0686b651834baace SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd -EBUILD mkl-10.0.2.018-r2.ebuild 9690 RMD160 d2827a62091bd7baa5c3f86db8388952a47ee977 SHA1 7e6e9aafe42e3eba5df7be51dbb10848ea4eb969 SHA256 55059c31feb49f8bff8bec65960e1872cee92c95d4b9c6eba307b9e34598aae7 -EBUILD mkl-10.0.5.025.ebuild 9839 RMD160 7356ce04f0b1008b13fdeb025d7a3916d256a720 SHA1 67107b36ab44e16bc8a8a414604106ebd013f2ac SHA256 d8f775ccb5d2f2e5db76c0f4f1bfe5a586177028023e5d4519a0257903584254 -EBUILD mkl-9.1.023.ebuild 8736 RMD160 53ea6d444e68215f17ebdbb47455f7a7cfc9ad6d SHA1 a1a40d4794ae90314e8a2b00a650f2d1437ec12b SHA256 d68efd65884e8e55799138fbca831854135d2bc49cf78ad0e008244da333c8d3 -MISC ChangeLog 8569 RMD160 64b5c84e2989fbe258946e1e5eaec36f2a691ba4 SHA1 237dd484d4fcd563b7a70c229ae319f1d8ea6ed7 SHA256 11afc23ddee52aee8dd4323b59b0ece6a6f5ed2ebd69276eb9cd76ae26e4f180 +EBUILD mkl-10.0.2.018-r2.ebuild 9835 RMD160 7434e2564020b8721061040e87d8bf9cf09ec9e7 SHA1 1aecbe849ebeab4bb9a3dab9114862dc610ee035 SHA256 de292cd680c6e697d56aa2b7d6f0f97079cb9ae7ab68a8a3383718b4fa41753b +EBUILD mkl-10.0.5.025.ebuild 9985 RMD160 4bdd34625edd78b71b679e7f5e6fb9fe6acab00c SHA1 7cf012a05c6a6302520ee38fea9c9436e59c750e SHA256 84c0839fef82563ef489496474b339e2a5ab7db0f6fd5ef3a86f0f924edfeba2 +EBUILD mkl-9.1.023.ebuild 8880 RMD160 903e637f5ddd087205859ab5932e73c8da18d2ea SHA1 0d2f9f74eb375d32ecac473b95116e32ec0298dc SHA256 ce69982cf55fc4e4aebf5faa67e583fa0b74941b9cc949f4603d5ee9a82280ec +MISC ChangeLog 8721 RMD160 8ae9640d8d167d06740e665c4ed01a0d27cdb3fc SHA1 094bc47cb8a4675e4ee6a4aaf1f2d0e87d243a80 SHA256 66d649929d8dbd199a5c0e5d7d1b15f4f9882d9621b6066c1f1c5b972305720b MISC metadata.xml 858 RMD160 40285d03152575e5d0cb91abc9fb61c1af3e7abc SHA1 88f8f122cfdf350a8fcff81f72b2c056438ffe37 SHA256 fcff9afd76b48ea7e812ea8a32a78ab8325379ce28e0893032d46c06d00a5a8a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAk0LHksACgkQgAnW8HDreRbfNACeJVtrmKSRH6d9lOHbn2DKMyP3 +coYAoNHewQkRn6NnmXUp2behRJoqILin +=+pPK +-----END PGP SIGNATURE----- diff --git a/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild b/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild index d7234d1adfd6..554b68f2a294 100644 --- a/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild +++ b/sci-libs/mkl/mkl-10.0.2.018-r2.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/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild,v 1.4 2010/12/16 18:58:00 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.2.018-r2.ebuild,v 1.5 2010/12/17 08:24:38 jlec Exp $ inherit eutils toolchain-funcs check-reqs @@ -29,6 +29,16 @@ RDEPEND="${DEPEND} MKL_DIR=/opt/intel/${PN}/${PV} INTEL_LIC_DIR=/opt/intel/licenses +get_fcomp() { + case $(tc-getFC) in + *gfortran* ) + FCOMP="gfortran" ;; + ifort ) + FCOMP="ifc" ;; + * ) + FCOMP=$(tc-getFC) ;; + esac +} pkg_setup() { # Check the license if [[ -z ${MKL_LICENSE} ]]; then @@ -50,11 +60,11 @@ pkg_setup() { # Check and setup fortran if use fortran95; then # blas95 and lapack95 don't compile with gfortran < 4.2 - [[ $(tc-getFC) == g* ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && + [[ $(tc-getFC) =~ g* ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && die "blas95 and lapack95 don't compile with gfortran < 4.2" fi MKL_FC="gnu" - [[ $(tc-getFC) == if* ]] && MKL_FC="intel" + [[ $(tc-getFC) =~ if* ]] && MKL_FC="intel" # build profiles according to what compiler is installed MKL_CC="gnu" @@ -69,6 +79,7 @@ pkg_setup() { else MKL_MPI=intelmpi fi + get_fcomp } src_unpack() { @@ -142,11 +153,11 @@ src_compile() { if use fortran95; then einfo "Compiling fortan95 static lib wrappers" local myconf="lib${MKL_ARCH}" - [[ $(tc-getFC) == gfortran ]] && \ + [[ $(tc-getFC) =~ gfortran ]] && \ myconf="${myconf} FC=gfortran" if use int64; then myconf="${myconf} interface=ilp64" - [[ $(tc-getFC) == gfortran ]] && \ + [[ $(tc-getFC) =~ gfortran ]] && \ myconf="${myconf} FOPTS=-fdefault-integer-8" fi for x in blas95 lapack95; do diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild index cf7534c2f923..3afe07a91f23 100644 --- a/sci-libs/mkl/mkl-10.0.5.025.ebuild +++ b/sci-libs/mkl/mkl-10.0.5.025.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/sci-libs/mkl/mkl-10.0.5.025.ebuild,v 1.6 2010/12/16 18:58:00 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.5.025.ebuild,v 1.7 2010/12/17 08:24:38 jlec Exp $ inherit eutils toolchain-funcs check-reqs @@ -29,6 +29,17 @@ INTEL_LIC_DIR=/opt/intel/licenses QA_EXECSTACK="opt/intel/${PN}/${PV}/*" QA_TEXTRELS="opt/intel/${PN}/${PV}/*" +get_fcomp() { + case $(tc-getFC) in + *gfortran* ) + FCOMP="gfortran" ;; + ifort ) + FCOMP="ifc" ;; + * ) + FCOMP=$(tc-getFC) ;; + esac +} + pkg_setup() { # Check the license if [[ -z ${MKL_LICENSE} ]]; then @@ -50,11 +61,11 @@ pkg_setup() { # Check and setup fortran if use fortran95; then # blas95 and lapack95 don't compile with gfortran < 4.2 - [[ $(tc-getFC) == g* ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && + [[ $(tc-getFC) =~ g* ]] && [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && die "blas95 and lapack95 don't compile with gfortran < 4.2" fi MKL_FC="gnu" - [[ $(tc-getFC) == if* ]] && MKL_FC="intel" + [[ $(tc-getFC) =~ if* ]] && MKL_FC="intel" # build profiles according to what compiler is installed MKL_CC="gnu" @@ -69,6 +80,7 @@ pkg_setup() { else MKL_MPI=intelmpi fi + get_fcomp } src_unpack() { @@ -146,11 +158,11 @@ src_compile() { if use fortran95; then einfo "Compiling fortan95 static lib wrappers" local myconf="lib${MKL_ARCH}" - [[ $(tc-getFC) == gfortran ]] && \ + [[ $(tc-getFC) =~ gfortran ]] && \ myconf="${myconf} FC=gfortran" if use int64; then myconf="${myconf} interface=ilp64" - [[ $(tc-getFC) == gfortran ]] && \ + [[ $(tc-getFC) =~ gfortran ]] && \ myconf="${myconf} FOPTS=-fdefault-integer-8" fi for x in blas95 lapack95; do diff --git a/sci-libs/mkl/mkl-9.1.023.ebuild b/sci-libs/mkl/mkl-9.1.023.ebuild index 067e88fb8622..f95b2d55e1dc 100644 --- a/sci-libs/mkl/mkl-9.1.023.ebuild +++ b/sci-libs/mkl/mkl-9.1.023.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/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.10 2010/12/16 15:47:27 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.11 2010/12/17 08:24:38 jlec Exp $ inherit eutils versionator toolchain-funcs @@ -34,6 +34,17 @@ RDEPEND="${DEPEND} MKL_DIR=/opt/intel/${PN}/${MAJOR}.${MINOR} +get_fcomp() { + case $(tc-getFC) in + *gfortran* ) + FCOMP="gfortran" ;; + ifort ) + FCOMP="ifc" ;; + * ) + FCOMP=$(tc-getFC) ;; + esac +} + pkg_setup() { # setting up license [[ -z ${MKL_LICENSE} && -d /opt/intel/licenses ]] && \ @@ -51,6 +62,7 @@ pkg_setup() { # setting up compilers MKL_CC=gnu [[ $(tc-getCC) == icc ]] && MKL_CC=icc + get_fcomp } src_unpack() { @@ -125,7 +137,7 @@ src_unpack() { fi # fix a bad makefile in the test - if [[ $(tc-getFC) == gfortran ]] || [[ $(tc-getFC) == if* ]]; then + if [[ $(tc-getFC) =~ gfortran ]] || [[ $(tc-getFC) =~ if* ]]; then sed -i \ -e "s/g77/$(tc-getFC)/" \ -e 's/-DGNU_USE//' \ @@ -196,7 +208,7 @@ mkl_install_lib() { local extlibs="-L${libdir} -lguide -lpthread" [[ "${1}" == "serial" ]] && extlibs="" - [[ "$(tc-getFC)" == "gfortran" ]] && \ + [[ $(tc-getFC) =~ gfortran ]] && \ gfortranlibs="-L${libdir} -lmkl_gfortran" cp -pPR "${S}"/${proflib} "${D}"${MKL_DIR} @@ -286,7 +298,7 @@ pkg_postinst() { elif use serial; then ext=serial fi - ESELECT_PROF="${PN}-$(tc-getFC)-${ext}" + ESELECT_PROF="${PN}-${FCOMP}-${ext}" # if blas profile is mkl, set lapack and cblas profiles as mkl local blas_lib=$(eselect blas show | cut -d' ' -f2) for p in blas cblas lapack; do |