summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-04-12 18:38:38 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-04-12 18:38:38 +0000
commitaa62170814f0a27d4335dbd18bdf040c4ba30f16 (patch)
tree590bc0eba85c5e49397528ad2691155c44913995 /sci-libs
parentNo longer have pkgconfig in RDEPEND, Bug #217278. (diff)
downloadhistorical-aa62170814f0a27d4335dbd18bdf040c4ba30f16.tar.gz
historical-aa62170814f0a27d4335dbd18bdf040c4ba30f16.tar.bz2
historical-aa62170814f0a27d4335dbd18bdf040c4ba30f16.zip
Fixed tools installation (bug #217313, and swap checks between int64 and fortran95 for proper fortran settings
Package-Manager: portage-2.1.5_rc2
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/mkl/ChangeLog7
-rw-r--r--sci-libs/mkl/Manifest10
-rw-r--r--sci-libs/mkl/mkl-10.0.2.018.ebuild6
3 files changed, 14 insertions, 9 deletions
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index eac04d13aaa0..bdf337359b5a 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/mkl
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.24 2008/04/08 21:35:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.25 2008/04/12 18:38:38 bicatali Exp $
+
+ 12 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
+ mkl-10.0.2.018.ebuild:
+ Fixed tools installation (bug #217313, and swap checks between int64 and
+ fortran95 for proper fortran settings
08 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org>
mkl-10.0.2.018.ebuild:
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 5e914b0f6f60..9354c2aebfb0 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -9,14 +9,14 @@ AUX mkl-10.0.2.018-tests.patch 528 RMD160 15f11a38567bd533626008fce62e6021372bfc
DIST l_mkl_enh_p_9.1.023.tgz 316915220 RMD160 afdcb8ef28053e9ee5b1a3f8b9e6126c58b94f4b SHA1 9b03333627ab69cf9139838444e6e43d0b7404c8 SHA256 609ba57261b4959dfc8e6e56959f93ff7dba7b568ca5c80e09f4013df0207106
DIST l_mkl_p_10.0.2.018.tgz 227440983 RMD160 0c28416597ef917328193fa0c6403d7c0e7b971d SHA1 1aa8c47701b142ab52ebcda27fdda4c5d0903471 SHA256 311d2885a33d553a2d1b1370eed1e3e9bccc246f2dcd20e3558ed492443ba20f
DIST l_mkl_p_9.1.023.tgz 155907883 RMD160 f5d34a170c77fe9929daf6a83bade6d845ada2ad SHA1 52693b9aca15d43a890af92e0686b651834baace SHA256 7315e35a48b8cbe5af4cdcd24b2ccbd3971048b40e965ccaf9b4d655d98bdecd
-EBUILD mkl-10.0.2.018.ebuild 9119 RMD160 d4da1b88e898a17bde0fcf8bee5eab94f92146dd SHA1 8278d5fe757294ef9aa21a7001d4399572000c02 SHA256 1f722cb49b67376aef4574258761c687d255a194a02649690f0f0fd934ab52ed
+EBUILD mkl-10.0.2.018.ebuild 9122 RMD160 e94efe361b86411313f64fe2555b9eb02463f31c SHA1 0682c800819a237dfb4f0ec3babe428ddde6f70c SHA256 4d142d57fdd5ba3d763a78f85f14e0464e2805b61a1ca7663ed41ba1724a06cd
EBUILD mkl-9.1.023.ebuild 8892 RMD160 e91c9f013cc43bce6eee882dddbb0524730d6dc7 SHA1 5c9bd8c4cb22d3da629aed92f5a9efed3fc12cfb SHA256 55bc642dbd2de8410d43fcdc443295939600d23508311b22c41963b1da46ceb5
-MISC ChangeLog 5545 RMD160 1263fbf1720921386f42e0dabf3d208db0be8924 SHA1 8713cb7631056bd0f8f8ff2e6bc03ea09f006223 SHA256 008ebf5bb35189befd4255ca868b2b3b0ffa351e58ebccc70e6339c47c558cee
+MISC ChangeLog 5741 RMD160 6e305f32bf92f4a507cd1f6133bd95d6b56c8b6a SHA1 f061908a9c5abb00ded2f91e37c50d28cadb9b65 SHA256 dae170d33fba55c09168fd17155b3cb25b67f49be6bd9648a6b82bcbb8293225
MISC metadata.xml 605 RMD160 a48ecbc106b8037bc5ea0c075d0b1efe1c9532b2 SHA1 ca9d24da338e47cbeceec284d724405291d4d29a SHA256 449f256f34be916da81300d86c5c224fd01aeb378d35c10274de9b42e61896da
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFH++Ug1ycZbhPLE2ARAgzBAJ4+aDGqPvdUxqiOBghQYegHxYCjegCgtAnZ
-04NhMDR5z6SoijBN52aArUg=
-=i+fm
+iD8DBQFIAQG/1ycZbhPLE2ARAi7dAJ9mYRGDFhkxR+gJz1DMmu1LTtZ3TwCfWd8J
+uQ0hnsxm4cePkqFy9HmC+xg=
+=XirD
-----END PGP SIGNATURE-----
diff --git a/sci-libs/mkl/mkl-10.0.2.018.ebuild b/sci-libs/mkl/mkl-10.0.2.018.ebuild
index 9aaeeb45e75a..d24dfb4b1bb1 100644
--- a/sci-libs/mkl/mkl-10.0.2.018.ebuild
+++ b/sci-libs/mkl/mkl-10.0.2.018.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 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.ebuild,v 1.2 2008/04/08 21:35:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-10.0.2.018.ebuild,v 1.3 2008/04/12 18:38:38 bicatali Exp $
inherit eutils toolchain-funcs fortran check-reqs
@@ -54,12 +54,12 @@ pkg_setup() {
# Check and setup fortran
FORTRAN="gfortran ifc g77"
+ use int64 && FORTRAN="gfortran ifc"
if use fortran95; then
FORTRAN="gfortran ifc"
# blas95 and lapack95 don't compile with gfortran < 4.2
[[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] && FORTRAN="ifc"
fi
- use int64 && FORTRAN="gfortran ifc"
fortran_pkg_setup
MKL_FC="gnu"
[[ ${FORTRANC} == if* ]] && MKL_FC="intel"
@@ -286,7 +286,7 @@ src_install() {
local doinsdirs="tools"
cp -pPR ${cpdirs} "${D}"${MKL_DIR} \
|| die "installing mkl failed"
- doins ${doinsdirs} || die "doins ${doinsdirs} failed"
+ doins -r ${doinsdirs} || die "doins ${doinsdirs} failed"
# install blas/lapack profiles
mkl_make_generic_profile