From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6BE01382C5 for ; Sat, 27 Jan 2018 13:57:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF84AE08EA; Sat, 27 Jan 2018 13:57:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB791E08EA for ; Sat, 27 Jan 2018 13:57:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDC21335C2E for ; Sat, 27 Jan 2018 13:57:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B9FD1C8 for ; Sat, 27 Jan 2018 13:57:32 +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: <1517061445.12f9dbe06930ec02e9628dd87ced2c138be755d1.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/mkl/mkl-11.1.3.174-r1.ebuild sci-libs/mkl/mkl-11.2.4.233.ebuild sci-libs/mkl/mkl-11.3.2.181.ebuild X-VCS-Directories: sci-libs/mkl/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 12f9dbe06930ec02e9628dd87ced2c138be755d1 X-VCS-Branch: master Date: Sat, 27 Jan 2018 13:57:32 +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: 1bf707ae-4054-4e52-a526-3c0552ec3ad0 X-Archives-Hash: 8b09afdc244769abe2cd302c423db41c commit: 12f9dbe06930ec02e9628dd87ced2c138be755d1 Author: Justin Lecher gentoo org> AuthorDate: Sat Jan 27 13:57:25 2018 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Jan 27 13:57:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=12f9dbe0 sci-libs/mkl: Update to new localization handling Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.20, Repoman-2.3.6 sci-libs/mkl/mkl-11.1.3.174-r1.ebuild | 142 ------------------------------ sci-libs/mkl/mkl-11.2.4.233.ebuild | 160 ---------------------------------- sci-libs/mkl/mkl-11.3.2.181.ebuild | 8 +- 3 files changed, 4 insertions(+), 306 deletions(-) diff --git a/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild deleted file mode 100644 index a60b13dca..000000000 --- a/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -INTEL_DPN=parallel_studio_xe -INTEL_DID=4220 -INTEL_DPV=2013_sp1_update3 -INTEL_SUBDIR=composerxe -INTEL_SINGLE_ARCH=false -INTEL_SKIP_LICENSE=true - -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 - mkl-cluster mkl-cluster-devel - mkl-f95-devel - mkl-gnu mkl-gnu-devel - mkl-pgi mkl-pgi-devel" -# single arch packages -# mkl-mic mkl-mic-devel -# mkl-sp2dp mkl-sp2dp-devel -INTEL_DAT_RPMS="mkl-common mkl-cluster-common mkl-f95-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} - libdir_comp=${INTEL_SDP_EDIR}/compiler/lib/${IARCH} - includedir=\${prefix}/include - Name: ${pcname} - Description: ${DESCRIPTION} - Version: ${PV} - URL: ${HOMEPAGE} - Libs: -L\${libdir} -L\${libdir_comp} ${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,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" - local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${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="${gc} -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="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ - mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${gc} -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.2.4.233.ebuild b/sci-libs/mkl/mkl-11.2.4.233.ebuild deleted file mode 100644 index d1968bda6..000000000 --- a/sci-libs/mkl/mkl-11.2.4.233.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -INTEL_DPN=parallel_studio_xe -INTEL_DID=8470 -INTEL_DPV=2015_update6 -INTEL_SUBDIR=composerxe -INTEL_SINGLE_ARCH=false -INTEL_SKIP_LICENSE=true - -NUMERIC_MODULE_NAME=${PN} - -inherit alternatives-2 intel-sdp numeric-int64-multibuild - -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-15[${MULTILIB_USEDEP}]" - -CHECKREQS_DISK_BUILD=2500M - -INTEL_BIN_RPMS=( - mkl mkl-devel - mkl-cluster mkl-cluster-devel - mkl-f95-devel - mkl-gnu mkl-gnu-devel - mkl-pgi mkl-pgi-devel - ) -INTEL_AMD64_RPMS=( - mkl-mic mkl-mic-devel - mkl-sp2dp mkl-sp2dp-devel - ) -INTEL_DAT_RPMS=( - mkl-common - mkl-cluster-common - mkl-f95-common - ) - -pkg_setup() { - intel-sdp_pkg_setup -} - -src_prepare() { - chmod u+w -R opt || die -} - -_mkl_add_pc_file() { - local pcname=${1} cflags="" suffix="" - shift - numeric-int64_is_int64_build && cflags=-DMKL_ILP64 && suffix="-int64" - - local IARCH=$(convert2intel_arch ${MULTIBUILD_ID}) - - create_pkgconfig \ - --prefix "${INTEL_SDP_EDIR}/mkl" \ - --libdir "\${prefix}/lib/${IARCH}" \ - --includedir "\${prefix}/include" \ - --name ${pcname} \ - --libs "-L\${libdir} -L${INTEL_SDP_EDIR}/compiler/lib/${IARCH} $* -lpthread -lm" \ - --cflags "-I\${includedir} ${cflags}" \ - ${pcname}${suffix} -} - -_mkl_add_alternative_provider() { - local prov=$1; shift - local alt - for alt in $*; do - NUMERIC_MODULE_NAME=${prov} \ - numeric-int64-multibuild_install_alternative ${alt} ${prov} - done -} - -# help: http://software.intel.com/en-us/articles/intel-mkl-link-line-advisor/ -mkl_add_pc_file() { - local bits="" - [[ ${MULTIBUILD_ID} =~ amd64 ]] && bits=_lp64 - numeric-int64_is_int64_build && bits=_ilp64 - - local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" - local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" - local intel="-Wl,--start-group -lmkl_intel${bits}" - local core="-lmkl_core -Wl,--end-group" - - # blas lapack cblas lapacke - _mkl_add_pc_file mkl-gfortran ${gf} -lmkl_sequential ${core} - _mkl_add_pc_file mkl-intel ${intel} -lmkl_sequential ${core} - _mkl_add_pc_file mkl-gfortran-openmp ${gf} -lmkl_gnu_thread ${core} -fopenmp - _mkl_add_pc_file mkl-gcc-openmp ${gc} -lmkl_gnu_thread ${core} -fopenmp - _mkl_add_pc_file mkl-intel-openmp ${intel} -lmkl_intel_thread ${core} -openmp - _mkl_add_pc_file mkl-dynamic -lmkl_rt - _mkl_add_pc_file mkl-dynamic-openmp -lmkl_rt -liomp5 - - # blacs and scalapack - local scal="-lmkl_scalapack${bits:-_core}" - local blacs="-lmkl_blacs_intelmpi${bits}" - core="-lmkl_core ${blacs} -Wl,--end-group" - - _mkl_add_pc_file mkl-gfortran-blacs ${gf} -lmkl_sequential ${core} - _mkl_add_pc_file mkl-gfortran-scalapack ${scal} ${gf} -lmkl_sequential ${core} - _mkl_add_pc_file mkl-intel-blacs ${intel} -lmkl_sequential ${core} - _mkl_add_pc_file mkl-intel-scalapack ${scal} ${intel} -lmkl_sequential ${core} - _mkl_add_pc_file mkl-gfortran-openmp-blacs ${gf} -lmkl_gnu_thread ${core} -fopenmp - _mkl_add_pc_file mkl-gfortran-openmp-scalapack ${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp - _mkl_add_pc_file mkl-gcc-openmp-blacs ${gc} -lmkl_gnu_thread ${core} -fopenmp - _mkl_add_pc_file mkl-gcc-openmp-scalapack ${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp - _mkl_add_pc_file mkl-intel-openmp-blacs ${intel} -lmkl_intel_thread ${core} -liomp5 - _mkl_add_pc_file mkl-intel-openmp-scalapack ${scal} ${intel} -lmkl_intel_thread ${core} -liomp5 - _mkl_add_pc_file mkl-dynamic-blacs -lmkl_rt ${blacs} - _mkl_add_pc_file mkl-dynamic-scalapack ${scal} -lmkl_rt ${blacs} - _mkl_add_pc_file mkl-dynamic-openmp-blacs -lmkl_rt ${blacs} -liomp5 - _mkl_add_pc_file mkl-dynamic-openmp-scalapack ${scal} -lmkl_rt ${blacs} -liomp5 -} - -mkl_add_alternative_provider() { - # blas lapack cblas lapacke - _mkl_add_alternative_provider mkl-gfortran blas lapack - _mkl_add_alternative_provider mkl-intel blas lapack cblas lapacke - _mkl_add_alternative_provider mkl-gfortran-openmp blas lapack - _mkl_add_alternative_provider mkl-gcc-openmp cblas lapacke - _mkl_add_alternative_provider mkl-intel-openmp blas lapack cblas lapacke - _mkl_add_alternative_provider mkl-dynamic blas lapack cblas lapacke - _mkl_add_alternative_provider mkl-dynamic-openmp blas lapack cblas lapacke - - # blacs and scalapack - _mkl_add_alternative_provider mkl-gfortran-blacs blacs - _mkl_add_alternative_provider mkl-gfortran-scalapack scalapack - _mkl_add_alternative_provider mkl-intel-blacs blacs - _mkl_add_alternative_provider mkl-intel-scalapack scalapack - _mkl_add_alternative_provider mkl-gfortran-openmp-blacs blacs - _mkl_add_alternative_provider mkl-gfortran-openmp-scalapack scalapack - _mkl_add_alternative_provider mkl-gcc-openmp-blacs blacs - _mkl_add_alternative_provider mkl-gcc-openmp-scalapack scalapack - _mkl_add_alternative_provider mkl-intel-openmp-blacs blacs - _mkl_add_alternative_provider mkl-intel-openmp-scalapack scalapack - _mkl_add_alternative_provider mkl-dynamic-blacs blacs - _mkl_add_alternative_provider mkl-dynamic-scalapack scalapack - _mkl_add_alternative_provider mkl-dynamic-openmp-blacs blacs - _mkl_add_alternative_provider mkl-dynamic-openmp-scalapack scalapack -} - -src_install() { - local IARCH - local ldpath="LDPATH=" - intel-sdp_src_install - - numeric-int64-multibuild_foreach_all_abi_variants mkl_add_pc_file - mkl_add_alternative_provider - - use abi_x86_64 && ldpath+=":${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_64)" - use abi_x86_32 && ldpath+=":${INTEL_SDP_EDIR}/mkl/lib/$(convert2intel_arch abi_x86_32)" - - echo "${ldpath}" > "${T}"/35mkl || die - doenvd "${T}"/35mkl -} diff --git a/sci-libs/mkl/mkl-11.3.2.181.ebuild b/sci-libs/mkl/mkl-11.3.2.181.ebuild index b4d1e6d39..b4b35f8b2 100644 --- a/sci-libs/mkl/mkl-11.3.2.181.ebuild +++ b/sci-libs/mkl/mkl-11.3.2.181.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ inherit alternatives-2 intel-sdp-r1 numeric-int64-multibuild DESCRIPTION="Intel Math Kernel Library: linear algebra, fft, math functions" HOMEPAGE="http://software.intel.com/en-us/articles/intel-mkl/" -IUSE="doc examples linguas_ja mic" +IUSE="doc examples l10n_ja mic" KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" DEPEND="" @@ -53,7 +53,7 @@ pkg_setup() { "mkl-doc-11.3.2-181.noarch.rpm" "mkl-ps-doc-11.3.2-181.noarch.rpm") - if use linguas_ja; then + if use l10n_ja; then INTEL_DIST_DAT_RPMS+=( "mkl-ps-doc-jp-11.3.2-181.noarch.rpm") fi @@ -67,7 +67,7 @@ pkg_setup() { "mkl-ps-tbb-mic-devel") fi - if use linguas_ja; then + if use l10n_ja; then INTEL_DIST_BIN_RPMS+=( "mkl-ps-jp")