From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 37FC813827E for ; Sun, 8 Dec 2013 17:31:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C822FE09C1; Sun, 8 Dec 2013 17:31:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4DEE2E09C1 for ; Sun, 8 Dec 2013 17:31:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4EEC433F21D for ; Sun, 8 Dec 2013 17:31:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 92FF6E55F9 for ; Sun, 8 Dec 2013 17:31:23 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1386509806.4bb5bbc94c8fb5ee9e69843bae39435b709348db.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/mkl/ChangeLog sci-libs/mkl/mkl-11.0.3.163.ebuild sci-libs/mkl/mkl-11.0.5.192.ebuild sci-libs/mkl/mkl-11.1.0.080-r1.ebuild sci-libs/mkl/mkl-11.1.0.080.ebuild X-VCS-Directories: sci-libs/mkl/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 4bb5bbc94c8fb5ee9e69843bae39435b709348db X-VCS-Branch: master Date: Sun, 8 Dec 2013 17:31:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d53486f1-3dee-48e6-a6ab-6f17f5e4cfd5 X-Archives-Hash: 23aae49557ced3392780d85231c748f0 commit: 4bb5bbc94c8fb5ee9e69843bae39435b709348db Author: Justin Lecher gentoo org> AuthorDate: Sun Dec 8 13:36:46 2013 +0000 Commit: Justin Lecher gentoo 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 -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 +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