From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/
Date: Sun, 8 Dec 2013 17:31:23 +0000 (UTC) [thread overview]
Message-ID: <1386509806.4bb5bbc94c8fb5ee9e69843bae39435b709348db.jlec@gentoo> (raw)
commit: 4bb5bbc94c8fb5ee9e69843bae39435b709348db
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 8 13:36:46 2013 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 8 13:36:46 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4bb5bbc9
sci-libs/mkl: Fix linking problems with openmp support, #492802; thanks Andrew Savchenko for the patch
Package-Manager: portage-2.2.7
---
sci-libs/mkl/ChangeLog | 5 +
sci-libs/mkl/mkl-11.0.3.163.ebuild | 131 ---------------------
sci-libs/mkl/mkl-11.0.5.192.ebuild | 131 ---------------------
...-11.1.0.080.ebuild => mkl-11.1.0.080-r1.ebuild} | 3 +-
4 files changed, 7 insertions(+), 263 deletions(-)
diff --git a/sci-libs/mkl/ChangeLog b/sci-libs/mkl/ChangeLog
index ce281d4..907a304 100644
--- a/sci-libs/mkl/ChangeLog
+++ b/sci-libs/mkl/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Dec 2013; Justin Lecher <jlec@gentoo.org> -mkl-11.0.3.163.ebuild,
+ -mkl-11.0.5.192.ebuild, -mkl-11.1.0.080.ebuild, +mkl-11.1.0.080-r1.ebuild:
+ Fix linking problems with openmp support, #492802; thanks Andrew Savchenko
+ for the patch
+
*mkl-11.1.0.080 (02 Oct 2013)
02 Oct 2013; Justin Lecher <jlec@gentoo.org> +mkl-11.1.0.080.ebuild:
diff --git a/sci-libs/mkl/mkl-11.0.3.163.ebuild b/sci-libs/mkl/mkl-11.0.3.163.ebuild
deleted file mode 100644
index fee4df0..0000000
--- a/sci-libs/mkl/mkl-11.0.3.163.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3078
-INTEL_DPV=2013_update3
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="mkl mkl-devel"
-INTEL_DAT_RPMS="mkl-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} ${libs}
- Cflags: -I\${includedir} ${cflags}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${pcname}.pc
- for x in $*; do
- alternatives_for ${x} ${pcname/-${x}} 0 \
- /usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
- done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.0.5.192.ebuild b/sci-libs/mkl/mkl-11.0.5.192.ebuild
deleted file mode 100644
index 8476f94..0000000
--- a/sci-libs/mkl/mkl-11.0.5.192.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-INTEL_DPN=parallel_studio_xe
-INTEL_DID=3266
-INTEL_DPV=2013_update4
-INTEL_SUBDIR=composerxe
-
-inherit intel-sdp multilib alternatives-2
-
-DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions"
-HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/"
-
-IUSE=""
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND=">=dev-libs/intel-common-13"
-
-CHECKREQS_DISK_BUILD=2500M
-
-INTEL_BIN_RPMS="mkl mkl-devel"
-INTEL_DAT_RPMS="mkl-common"
-
-src_prepare() {
- chmod u+w -R opt
-}
-
-mkl_add_prof() {
- local pcname=${1} libs cflags x
- shift
- [[ ${pcname} = *int64* ]] && cflags=-DMKL_ILP64
- cat <<-EOF > ${pcname}.pc
- prefix=${INTEL_SDP_EDIR}/mkl
- libdir=\${prefix}/lib/${IARCH}
- includedir=\${prefix}/include
- Name: ${pcname}
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} ${libs}
- Cflags: -I\${includedir} ${cflags}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${pcname}.pc
- for x in $*; do
- alternatives_for ${x} ${pcname/-${x}} 0 \
- /usr/$(get_libdir)/pkgconfig/${x}.pc ${pcname}.pc
- done
-}
-
-# mkl_prof [_ilp64 or _lp64]
-# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/
-mkl_prof() {
- local bits=""
- if [[ ${IARCH} == intel64 ]]; then
- bits=_lp64
- [[ ${1} == int64 ]] && bits=_ilp64
- fi
- local gf="-Wl,--start-group -lmkl_gf${bits}"
- local intel="-Wl,--start-group -lmkl_intel${bits}"
- local core="-lmkl_core -Wl,--end-group"
- local prof=mkl${IARCH:((${#IARCH} - 2)):2}
- [[ ${1} == int64 ]] && prof=${prof}-int64
- local libs
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran blas lapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel blas lapack cblas lapacke
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp blas lapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp cblas lapacke
- libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \
- mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke
- libs="-lmkl_rt -lpthread" \
- mkl_add_prof ${prof}-dynamic blas lapack cblas lapacke
- libs="-lmkl_rt -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp blas lapack cblas lapacke
-
- # blacs and scalapack
- local scal="-lmkl_scalapack${bits:-_core}"
- local blacs="-lmkl_blacs_intelmpi${bits}"
- core="-lmkl_core ${blacs} -Wl,--end-group"
-
- libs="${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-blacs blacs
- libs="${scal} ${gf} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-gfortran-scalapack scalapack
- libs="${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-blacs blacs
- libs="${scal} ${intel} -lmkl_sequential ${core} -lpthread" \
- mkl_add_prof ${prof}-intel-scalapack scalapack
- libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-blacs blacs
- libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \
- mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack
- libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-blacs blacs
- libs="${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-intel-openmp-scalapack scalapack
- libs="-lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -lpthread" \
- mkl_add_prof ${prof}-dynamic-scalapack scalapack
- libs="-lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-blacs blacs
- libs="${scal} -lmkl_rt ${blacs} -liomp5 -lpthread" \
- mkl_add_prof ${prof}-dynamic-openmp-scalapack scalapack
-}
-
-src_install() {
- intel-sdp_src_install
- echo -n > 35mkl "LDPATH="
- for IARCH in ${INTEL_ARCH}; do
- mkl_prof
- sed -i -e '/mkl/s/$/:/' 35mkl
- echo -n >> 35mkl "${INTEL_SDP_EDIR}/mkl/lib/${IARCH}"
- [[ ${IARCH} == intel64 ]] && mkl_prof int64
- done
- echo >> 35mkl
- doenvd 35mkl
-}
diff --git a/sci-libs/mkl/mkl-11.1.0.080.ebuild b/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
similarity index 97%
rename from sci-libs/mkl/mkl-11.1.0.080.ebuild
rename to sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
index c674527..7f8eb07 100644
--- a/sci-libs/mkl/mkl-11.1.0.080.ebuild
+++ b/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild
@@ -45,12 +45,13 @@ mkl_add_prof() {
cat <<-EOF > ${pcname}.pc
prefix=${INTEL_SDP_EDIR}/mkl
libdir=\${prefix}/lib/${IARCH}
+ libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH}
includedir=\${prefix}/include
Name: ${pcname}
Description: ${DESCRIPTION}
Version: ${PV}
URL: ${HOMEPAGE}
- Libs: -L\${libdir} ${libs}
+ Libs: -L\${libdir} -L\${libdir_comp} ${libs}
Cflags: -I\${includedir} ${cflags}
EOF
insinto /usr/$(get_libdir)/pkgconfig
next reply other threads:[~2013-12-08 17:31 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-08 17:31 Justin Lecher [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-11-09 7:41 [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/ Benda XU
2020-05-05 6:30 Matthias Maier
2019-05-25 6:36 Matthias Maier
2018-04-03 16:44 Matthias Maier
2018-04-03 16:44 Matthias Maier
2018-01-27 13:57 Justin Lecher
2016-07-18 11:23 Martin Mokrejs
2016-02-22 8:10 Justin Lecher
2016-02-22 8:10 Justin Lecher
2016-02-22 8:10 Justin Lecher
2016-02-19 10:12 Justin Lecher
2015-12-27 16:19 Justin Lecher
2015-12-27 16:19 Justin Lecher
2015-06-24 9:51 Justin Lecher
2015-02-12 8:51 Justin Lecher
2014-12-02 15:36 Justin Lecher
2014-09-16 8:28 Justin Lecher
2014-06-03 7:06 Justin Lecher
2014-03-24 18:19 Justin Lecher
2014-02-21 16:19 Justin Lecher
2013-10-02 14:26 Justin Lecher
2013-05-25 4:40 Sebastien Fabbro
2013-05-02 14:19 Justin Lecher
2013-02-14 16:37 Justin Lecher
2013-02-14 10:35 Justin Lecher
2012-12-10 21:29 Justin Lecher
2012-10-27 9:04 Justin Lecher
2012-09-29 23:23 Sebastien Fabbro
2012-02-16 22:35 Sebastien Fabbro
2012-02-16 22:35 Sebastien Fabbro
2011-08-22 19:26 Sebastien Fabbro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386509806.4bb5bbc94c8fb5ee9e69843bae39435b709348db.jlec@gentoo \
--to=jlec@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox