| 1 |
bicatali 08/01/08 09:53:37 |
| 2 |
|
| 3 |
Modified: mkl-9.1.023.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Removed INCLUDE variable, re-arrange pkgconfig files |
| 6 |
(Portage version: 2.1.4_rc14) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 sci-libs/mkl/mkl-9.1.023.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: mkl-9.1.023.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- mkl-9.1.023.ebuild 21 Nov 2007 00:29:28 -0000 1.6 |
| 22 |
+++ mkl-9.1.023.ebuild 8 Jan 2008 09:53:37 -0000 1.7 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
-# Copyright 1999-2007 Gentoo Foundation |
| 25 |
+# Copyright 1999-2008 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.6 2007/11/21 00:29:28 bicatali Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.7 2008/01/08 09:53:37 bicatali Exp $ |
| 29 |
|
| 30 |
inherit eutils versionator toolchain-funcs fortran |
| 31 |
|
| 32 |
@@ -79,13 +79,13 @@ |
| 33 |
addwrite /opt/intel |
| 34 |
cp ${MKL_LICENSE} "${WORKDIR}"/ |
| 35 |
MKL_LIC="$(basename ${MKL_LICENSE})" |
| 36 |
- cat > mkl.ini << EOF |
| 37 |
-[MKL] |
| 38 |
-EULA_ACCEPT_REJECT=ACCEPT |
| 39 |
-FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC} |
| 40 |
-INSTALLMODE=NONRPM |
| 41 |
-INSTALL_DESTINATION=${S} |
| 42 |
-EOF |
| 43 |
+ cat > mkl.ini <<- EOF |
| 44 |
+ [MKL] |
| 45 |
+ EULA_ACCEPT_REJECT=ACCEPT |
| 46 |
+ FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC} |
| 47 |
+ INSTALLMODE=NONRPM |
| 48 |
+ INSTALL_DESTINATION=${S} |
| 49 |
+ EOF |
| 50 |
einfo "Extracting ..." |
| 51 |
./install \ |
| 52 |
--silent ${PWD}/mkl.ini \ |
| 53 |
@@ -207,15 +207,16 @@ |
| 54 |
cp -pPR "${S}"/${proflib} "${D}"${MKL_DIR} |
| 55 |
|
| 56 |
for x in blas cblas; do |
| 57 |
- cat > eselect.${x}.${prof} << EOF |
| 58 |
-${libdir}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/lib${x}.a |
| 59 |
-${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so |
| 60 |
-${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so.0 |
| 61 |
-${libdir}/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc |
| 62 |
-EOF |
| 63 |
+ cat > eselect.${x}.${prof} <<- EOF |
| 64 |
+ ${libdir}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/lib${x}.a |
| 65 |
+ ${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so |
| 66 |
+ ${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so.0 |
| 67 |
+ ${libdir}/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc |
| 68 |
+ EOF |
| 69 |
|
| 70 |
[[ ${x} == cblas ]] && \ |
| 71 |
- echo "${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h" >> eselect.${x}.${prof} |
| 72 |
+ echo "${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h" \ |
| 73 |
+ >> eselect.${x}.${prof} |
| 74 |
eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof} |
| 75 |
sed -e "s:@LIBDIR@:$(get_libdir):" \ |
| 76 |
-e "s:@INCDIR@:${MKL_DIR}/include:" \ |
| 77 |
@@ -227,12 +228,12 @@ |
| 78 |
doins ${x}.pc |
| 79 |
done |
| 80 |
|
| 81 |
- cat > eselect.lapack.${prof} << EOF |
| 82 |
-${libdir}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a |
| 83 |
-${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so |
| 84 |
-${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0 |
| 85 |
-${libdir}/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc |
| 86 |
-EOF |
| 87 |
+ cat > eselect.lapack.${prof} <<- EOF |
| 88 |
+ ${libdir}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a |
| 89 |
+ ${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so |
| 90 |
+ ${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0 |
| 91 |
+ ${libdir}/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc |
| 92 |
+ EOF |
| 93 |
sed -e "s:@LIBDIR@:$(get_libdir):" \ |
| 94 |
-e "s:@PV@:${PV}:" \ |
| 95 |
-e "s:@EXTLIBS@:${extlibs}:g" \ |
| 96 |
@@ -279,7 +280,6 @@ |
| 97 |
done |
| 98 |
|
| 99 |
echo "MANPATH=${MKL_DIR}/man" >> ${env_file} |
| 100 |
- echo "INCLUDE=${MKL_DIR}/include" >> ${env_file} |
| 101 |
doenvd ${env_file} || die "doenvd failed" |
| 102 |
} |
| 103 |
|
| 104 |
|
| 105 |
|
| 106 |
|
| 107 |
1.22 sci-libs/mkl/ChangeLog |
| 108 |
|
| 109 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.22&view=markup |
| 110 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.22&content-type=text/plain |
| 111 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?r1=1.21&r2=1.22 |
| 112 |
|
| 113 |
Index: ChangeLog |
| 114 |
=================================================================== |
| 115 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v |
| 116 |
retrieving revision 1.21 |
| 117 |
retrieving revision 1.22 |
| 118 |
diff -u -r1.21 -r1.22 |
| 119 |
--- ChangeLog 21 Nov 2007 00:29:28 -0000 1.21 |
| 120 |
+++ ChangeLog 8 Jan 2008 09:53:37 -0000 1.22 |
| 121 |
@@ -1,6 +1,10 @@ |
| 122 |
# ChangeLog for sci-libs/mkl |
| 123 |
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 124 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.21 2007/11/21 00:29:28 bicatali Exp $ |
| 125 |
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 126 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.22 2008/01/08 09:53:37 bicatali Exp $ |
| 127 |
+ |
| 128 |
+ 08 Jan 2008; Sébastien Fabbro <bicatali@g.o> files/blas.pc.in, |
| 129 |
+ files/cblas.pc.in, files/lapack.pc.in, mkl-9.1.023.ebuild: |
| 130 |
+ Removed INCLUDE variable, re-arrange pkgconfig files |
| 131 |
|
| 132 |
21 Nov 2007; Sébastien Fabbro <bicatali@g.o> mkl-9.1.023.ebuild: |
| 133 |
Removed PROVIDE, now lapack is new style virtual |
| 134 |
|
| 135 |
|
| 136 |
|
| 137 |
-- |
| 138 |
gentoo-commits@l.g.o mailing list |
Archives