* [gentoo-commits] gentoo-x86 commit in sci-libs/mkl: mkl-9.1.023.ebuild ChangeLog
@ 2007-10-11 16:48 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2007-10-11 16:48 UTC (permalink / raw
To: gentoo-commits
bicatali 07/10/11 16:48:29
Modified: mkl-9.1.023.ebuild ChangeLog
Log:
fixed lib->get_libdir for eselect bug workaround
(Portage version: 2.1.3.12)
Revision Changes Path
1.2 sci-libs/mkl/mkl-9.1.023.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?r1=1.1&r2=1.2
Index: mkl-9.1.023.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mkl-9.1.023.ebuild 10 Oct 2007 12:41:47 -0000 1.1
+++ mkl-9.1.023.ebuild 11 Oct 2007 16:48:28 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.1 2007/10/10 12:41:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.2 2007/10/11 16:48:28 bicatali Exp $
inherit eutils versionator toolchain-funcs fortran
@@ -293,7 +293,7 @@
local current_lib=$(eselect ${p} show | cut -d' ' -f2)
if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
# work around eselect bug #189942
- local configfile="${ROOT}"/etc/env.d/${p}/lib/config
+ local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
[[ -e ${configfile} ]] && rm -f ${configfile}
eselect ${p} set ${ESELECT_PROF}
elog "${p} has been eselected to ${ESELECT_PROF}"
1.17 sci-libs/mkl/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?r1=1.16&r2=1.17
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog 10 Oct 2007 12:41:47 -0000 1.16
+++ ChangeLog 11 Oct 2007 16:48:28 -0000 1.17
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/mkl
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.16 2007/10/10 12:41:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.17 2007/10/11 16:48:28 bicatali Exp $
+
+ 11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> mkl-9.1.023.ebuild:
+ fixed lib->get_libdir for eselect bug workaround
*mkl-9.1.023 (10 Oct 2007)
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/mkl: mkl-9.1.023.ebuild ChangeLog
@ 2007-10-15 16:07 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2007-10-15 16:07 UTC (permalink / raw
To: gentoo-commits
bicatali 07/10/15 16:07:05
Modified: mkl-9.1.023.ebuild ChangeLog
Log:
added mkl directory in pkgconfig cflags
(Portage version: 2.1.3.12)
Revision Changes Path
1.3 sci-libs/mkl/mkl-9.1.023.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?r1=1.2&r2=1.3
Index: mkl-9.1.023.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mkl-9.1.023.ebuild 11 Oct 2007 16:48:28 -0000 1.2
+++ mkl-9.1.023.ebuild 15 Oct 2007 16:07:05 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.2 2007/10/11 16:48:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.3 2007/10/15 16:07:05 bicatali Exp $
inherit eutils versionator toolchain-funcs fortran
@@ -218,6 +218,7 @@
echo "${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h" >> eselect.${x}.${prof}
eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
sed -e "s:@LIBDIR@:$(get_libdir):" \
+ -e "s:@INCDIR@:${MKL_DIR}/include:" \
-e "s:@PV@:${PV}:" \
-e "s:@EXTLIBS@:${extlibs}:g" \
"${FILESDIR}"/${x}.pc.in > ${x}.pc || die "sed ${x}.pc failed"
1.18 sci-libs/mkl/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?r1=1.17&r2=1.18
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog 11 Oct 2007 16:48:28 -0000 1.17
+++ ChangeLog 15 Oct 2007 16:07:05 -0000 1.18
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/mkl
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.17 2007/10/11 16:48:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.18 2007/10/15 16:07:05 bicatali Exp $
+
+ 15 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> files/cblas.pc.in,
+ mkl-9.1.023.ebuild:
+ added mkl directory in pkgconfig cflags
11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> mkl-9.1.023.ebuild:
fixed lib->get_libdir for eselect bug workaround
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/mkl: mkl-9.1.023.ebuild ChangeLog
@ 2007-10-17 15:06 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2007-10-17 15:06 UTC (permalink / raw
To: gentoo-commits
bicatali 07/10/17 15:06:32
Modified: mkl-9.1.023.ebuild ChangeLog
Log:
Cleaned-up linking and fixed tests thanks to Adam Piątyszek <ediap@et.put.poznan.pl>. Set consistency among eselect profiles.
(Portage version: 2.1.3.12)
Revision Changes Path
1.4 sci-libs/mkl/mkl-9.1.023.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?r1=1.3&r2=1.4
Index: mkl-9.1.023.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mkl-9.1.023.ebuild 15 Oct 2007 16:07:05 -0000 1.3
+++ mkl-9.1.023.ebuild 17 Oct 2007 15:06:32 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.3 2007/10/15 16:07:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.4 2007/10/17 15:06:32 bicatali Exp $
inherit eutils versionator toolchain-funcs fortran
@@ -162,7 +162,7 @@
einfo "Compiling fftw static lib wrappers for ${p}"
for x in "${S}"/interfaces/fft*; do
cd "${x}"
- emake \
+ emake -j1 \
F=${MKL_CC} \
MKL_SUBVERS=${p} \
lib${MKL_ARCH} \
@@ -175,8 +175,8 @@
src_test() {
local usegnu
[[ ${FORTRANC} = g* ]] && usegnu=gnu
- # restrict tests for blas and lapack for now.
- # testing fftw requires checking many C and fortran compilers
+ # restrict tests for blas and cblas for now.
+ # for t in blas cblas fft*; do
for t in blas lapack; do
cd "${S}"/tests/${t}
for p in ${MKL_PROF}; do
@@ -202,7 +202,7 @@
[[ "${1}" == "serial" ]] && extlibs=""
[[ "${FORTRANC}" == "gfortran" ]] && \
- extlibs="${extlibs} -L${libdir} -lmkl_gfortran"
+ gfortranlibs="-L${libdir} -lmkl_gfortran"
cp -pPR "${S}"/${proflib} "${D}"${MKL_DIR}
@@ -221,6 +221,7 @@
-e "s:@INCDIR@:${MKL_DIR}/include:" \
-e "s:@PV@:${PV}:" \
-e "s:@EXTLIBS@:${extlibs}:g" \
+ -e "s:@GFORTRANLIBS@:${gfortranlibs}:g" \
"${FILESDIR}"/${x}.pc.in > ${x}.pc || die "sed ${x}.pc failed"
insinto ${libdir}
doins ${x}.pc
@@ -235,6 +236,7 @@
sed -e "s:@LIBDIR@:$(get_libdir):" \
-e "s:@PV@:${PV}:" \
-e "s:@EXTLIBS@:${extlibs}:g" \
+ -e "s:@GFORTRANLIBS@:${gfortranlibs}:g" \
"${FILESDIR}"/lapack.pc.in > lapack.pc || die "sed lapack.pc failed"
insinto ${libdir}
doins lapack.pc
@@ -290,14 +292,22 @@
ext=serial
fi
ESELECT_PROF="${PN}-${FORTRANC}-${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
local current_lib=$(eselect ${p} show | cut -d' ' -f2)
- if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+ if [[ -z ${current_lib} || \
+ ${current_lib} == ${ESELECT_PROF} || \
+ ${blas_lib} == ${ESELECT_PROF} ]]; then
# work around eselect bug #189942
local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
[[ -e ${configfile} ]] && rm -f ${configfile}
eselect ${p} set ${ESELECT_PROF}
elog "${p} has been eselected to ${ESELECT_PROF}"
+ if [[ ${current_lib} != ${blas_lib} ]]; then
+ eselect blas set ${ESELECT_PROF}
+ elog "${p} has been eselected to ${ESELECT_PROF} for consistency"
+ fi
else
elog "Current eselected ${p} is ${current_lib}"
elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
1.19 sci-libs/mkl/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 15 Oct 2007 16:07:05 -0000 1.18
+++ ChangeLog 17 Oct 2007 15:06:32 -0000 1.19
@@ -1,6 +1,11 @@
# ChangeLog for sci-libs/mkl
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.18 2007/10/15 16:07:05 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.19 2007/10/17 15:06:32 bicatali Exp $
+
+ 17 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+ files/cblas.pc.in, files/lapack.pc.in, mkl-9.1.023.ebuild:
+ Cleaned-up linking and fixed tests thanks to Adam Piątyszek
+ <ediap@et.put.poznan.pl>. Set consistency among eselect profiles.
15 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> files/cblas.pc.in,
mkl-9.1.023.ebuild:
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/mkl: mkl-9.1.023.ebuild ChangeLog
@ 2007-10-18 13:59 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2007-10-18 13:59 UTC (permalink / raw
To: gentoo-commits
bicatali 07/10/18 13:59:25
Modified: mkl-9.1.023.ebuild ChangeLog
Log:
Re-added temporarily PROVIDE=virtual/lapack
(Portage version: 2.1.3.14)
Revision Changes Path
1.5 sci-libs/mkl/mkl-9.1.023.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?r1=1.4&r2=1.5
Index: mkl-9.1.023.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mkl-9.1.023.ebuild 17 Oct 2007 15:06:32 -0000 1.4
+++ mkl-9.1.023.ebuild 18 Oct 2007 13:59:25 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.4 2007/10/17 15:06:32 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.5 2007/10/18 13:59:25 bicatali Exp $
inherit eutils versionator toolchain-funcs fortran
@@ -33,6 +33,8 @@
dev-util/pkgconfig
doc? ( app-doc/blas-docs app-doc/lapack-docs )"
+PROVIDE="virtual/lapack"
+
MKL_DIR=/opt/intel/${PN}/${MAJOR}.${MINOR}
pkg_setup() {
1.20 sci-libs/mkl/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?r1=1.19&r2=1.20
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog 17 Oct 2007 15:06:32 -0000 1.19
+++ ChangeLog 18 Oct 2007 13:59:25 -0000 1.20
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/mkl
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.19 2007/10/17 15:06:32 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.20 2007/10/18 13:59:25 bicatali Exp $
+
+ 18 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> mkl-9.1.023.ebuild:
+ Re-added temporarily PROVIDE=virtual/lapack
17 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
files/cblas.pc.in, files/lapack.pc.in, mkl-9.1.023.ebuild:
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/mkl: mkl-9.1.023.ebuild ChangeLog
@ 2007-11-21 0:29 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2007-11-21 0:29 UTC (permalink / raw
To: gentoo-commits
bicatali 07/11/21 00:29:29
Modified: mkl-9.1.023.ebuild ChangeLog
Log:
Removed PROVIDE, now lapack is new style virtual
(Portage version: 2.1.3.19)
Revision Changes Path
1.6 sci-libs/mkl/mkl-9.1.023.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?r1=1.5&r2=1.6
Index: mkl-9.1.023.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mkl-9.1.023.ebuild 18 Oct 2007 13:59:25 -0000 1.5
+++ mkl-9.1.023.ebuild 21 Nov 2007 00:29:28 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.5 2007/10/18 13:59:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.6 2007/11/21 00:29:28 bicatali Exp $
inherit eutils versionator toolchain-funcs fortran
@@ -33,8 +33,6 @@
dev-util/pkgconfig
doc? ( app-doc/blas-docs app-doc/lapack-docs )"
-PROVIDE="virtual/lapack"
-
MKL_DIR=/opt/intel/${PN}/${MAJOR}.${MINOR}
pkg_setup() {
1.21 sci-libs/mkl/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?r1=1.20&r2=1.21
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog 18 Oct 2007 13:59:25 -0000 1.20
+++ ChangeLog 21 Nov 2007 00:29:28 -0000 1.21
@@ -1,6 +1,9 @@
# ChangeLog for sci-libs/mkl
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.20 2007/10/18 13:59:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.21 2007/11/21 00:29:28 bicatali Exp $
+
+ 21 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> mkl-9.1.023.ebuild:
+ Removed PROVIDE, now lapack is new style virtual
18 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> mkl-9.1.023.ebuild:
Re-added temporarily PROVIDE=virtual/lapack
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/mkl: mkl-9.1.023.ebuild ChangeLog
@ 2008-01-08 9:53 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2008-01-08 9:53 UTC (permalink / raw
To: gentoo-commits
bicatali 08/01/08 09:53:37
Modified: mkl-9.1.023.ebuild ChangeLog
Log:
Removed INCLUDE variable, re-arrange pkgconfig files
(Portage version: 2.1.4_rc14)
Revision Changes Path
1.7 sci-libs/mkl/mkl-9.1.023.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild?r1=1.6&r2=1.7
Index: mkl-9.1.023.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mkl-9.1.023.ebuild 21 Nov 2007 00:29:28 -0000 1.6
+++ mkl-9.1.023.ebuild 8 Jan 2008 09:53:37 -0000 1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-9.1.023.ebuild,v 1.6 2007/11/21 00:29:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/mkl-9.1.023.ebuild,v 1.7 2008/01/08 09:53:37 bicatali Exp $
inherit eutils versionator toolchain-funcs fortran
@@ -79,13 +79,13 @@
addwrite /opt/intel
cp ${MKL_LICENSE} "${WORKDIR}"/
MKL_LIC="$(basename ${MKL_LICENSE})"
- cat > mkl.ini << EOF
-[MKL]
-EULA_ACCEPT_REJECT=ACCEPT
-FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
-INSTALLMODE=NONRPM
-INSTALL_DESTINATION=${S}
-EOF
+ cat > mkl.ini <<- EOF
+ [MKL]
+ EULA_ACCEPT_REJECT=ACCEPT
+ FLEXLM_LICENSE_LOCATION=${WORKDIR}/${MKL_LIC}
+ INSTALLMODE=NONRPM
+ INSTALL_DESTINATION=${S}
+ EOF
einfo "Extracting ..."
./install \
--silent ${PWD}/mkl.ini \
@@ -207,15 +207,16 @@
cp -pPR "${S}"/${proflib} "${D}"${MKL_DIR}
for x in blas cblas; do
- cat > eselect.${x}.${prof} << EOF
-${libdir}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/lib${x}.a
-${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so
-${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so.0
-${libdir}/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc
-EOF
+ cat > eselect.${x}.${prof} <<- EOF
+ ${libdir}/libmkl_${MKL_KERN}.a /usr/@LIBDIR@/lib${x}.a
+ ${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so
+ ${libdir}/libmkl.so /usr/@LIBDIR@/lib${x}.so.0
+ ${libdir}/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc
+ EOF
[[ ${x} == cblas ]] && \
- echo "${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h" >> eselect.${x}.${prof}
+ echo "${MKL_DIR}/include/mkl_cblas.h /usr/include/cblas.h" \
+ >> eselect.${x}.${prof}
eselect ${x} add $(get_libdir) eselect.${x}.${prof} ${prof}
sed -e "s:@LIBDIR@:$(get_libdir):" \
-e "s:@INCDIR@:${MKL_DIR}/include:" \
@@ -227,12 +228,12 @@
doins ${x}.pc
done
- cat > eselect.lapack.${prof} << EOF
-${libdir}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
-${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
-${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
-${libdir}/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
-EOF
+ cat > eselect.lapack.${prof} <<- EOF
+ ${libdir}/libmkl_lapack.a /usr/@LIBDIR@/liblapack.a
+ ${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so
+ ${libdir}/libmkl_lapack.so /usr/@LIBDIR@/liblapack.so.0
+ ${libdir}/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc
+ EOF
sed -e "s:@LIBDIR@:$(get_libdir):" \
-e "s:@PV@:${PV}:" \
-e "s:@EXTLIBS@:${extlibs}:g" \
@@ -279,7 +280,6 @@
done
echo "MANPATH=${MKL_DIR}/man" >> ${env_file}
- echo "INCLUDE=${MKL_DIR}/include" >> ${env_file}
doenvd ${env_file} || die "doenvd failed"
}
1.22 sci-libs/mkl/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/mkl/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog 21 Nov 2007 00:29:28 -0000 1.21
+++ ChangeLog 8 Jan 2008 09:53:37 -0000 1.22
@@ -1,6 +1,10 @@
# ChangeLog for sci-libs/mkl
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.21 2007/11/21 00:29:28 bicatali Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mkl/ChangeLog,v 1.22 2008/01/08 09:53:37 bicatali Exp $
+
+ 08 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+ files/cblas.pc.in, files/lapack.pc.in, mkl-9.1.023.ebuild:
+ Removed INCLUDE variable, re-arrange pkgconfig files
21 Nov 2007; Sébastien Fabbro <bicatali@gentoo.org> mkl-9.1.023.ebuild:
Removed PROVIDE, now lapack is new style virtual
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-01-08 9:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-08 9:53 [gentoo-commits] gentoo-x86 commit in sci-libs/mkl: mkl-9.1.023.ebuild ChangeLog Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2007-11-21 0:29 Sebastien Fabbro (bicatali)
2007-10-18 13:59 Sebastien Fabbro (bicatali)
2007-10-17 15:06 Sebastien Fabbro (bicatali)
2007-10-15 16:07 Sebastien Fabbro (bicatali)
2007-10-11 16:48 Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox