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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3EE0D158020 for ; Sat, 10 Dec 2022 18:26:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7467AE08CE; Sat, 10 Dec 2022 18:26:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E71BE08CE for ; Sat, 10 Dec 2022 18:26:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50066340D21 for ; Sat, 10 Dec 2022 18:26:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5F063A5 for ; Sat, 10 Dec 2022 18:26:32 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1670696786.f344d9ecc4b6fae88fc5795aebdbf57c5563d080.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/mkl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild sci-libs/mkl/mkl-2022.2.1.16993.ebuild X-VCS-Directories: sci-libs/mkl/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: f344d9ecc4b6fae88fc5795aebdbf57c5563d080 X-VCS-Branch: master Date: Sat, 10 Dec 2022 18:26: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 15fd77ca-5aad-4a25-aee5-ac0b227bc400 X-Archives-Hash: 079223fc9eb5552f721963894ccd6c71 commit: f344d9ecc4b6fae88fc5795aebdbf57c5563d080 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sat Dec 10 18:24:25 2022 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Dec 10 18:26:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f344d9ec sci-libs/mkl: add convenience symlink without version number and drop the symlinks into /usr/include, these create file conflicts. Applications should be able to find the headers because we set the MKLROOT variable anyway. Signed-off-by: Andrew Ammerlaan gentoo.org> ...1.16993.ebuild => mkl-2022.2.1.16993-r1.ebuild} | 32 +++------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/sci-libs/mkl/mkl-2022.2.1.16993.ebuild b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild similarity index 81% rename from sci-libs/mkl/mkl-2022.2.1.16993.ebuild rename to sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild index 5f88f1e40685..63e646576e0a 100644 --- a/sci-libs/mkl/mkl-2022.2.1.16993.ebuild +++ b/sci-libs/mkl/mkl-2022.2.1.16993-r1.ebuild @@ -27,6 +27,7 @@ RESTRICT="strip" RDEPEND=" app-eselect/eselect-blas app-eselect/eselect-lapack + sys-cluster/mpich sys-libs/libomp " # bug #801460 @@ -55,34 +56,6 @@ src_install() { done popd || die - # Symlink files in include directory - pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include" || die - for file in *.h; do - dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}" - done - for file in *.f90; do - dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}" - done - for file in *.fi; do - dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/${file}" "/usr/include/${file}" - done - popd || die - pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/fftw" || die - for file in *; do - dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/fftw/${file}" "/usr/include/fftw/${file}" - done - popd || die - pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/intel64" || die - for file in *; do - dosym "../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/intel64/${file}" "/usr/include/${file}" - done - popd || die - pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/oneapi" || die - for file in *; do - dosym "../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/include/oneapi/${file}" "/usr/include/oneapi/${file}" - done - popd || die - # Symlink files in locale directory pushd "opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/locale/en_US" || die for file in *; do @@ -93,6 +66,9 @@ src_install() { # Move everything over to the image directory mv "${S}/"* "${ED}" || die + # Create convenience symlink that does not include the version number + dosym "$(ver_cut 1-3)" /opt/intel/oneapi/mkl/latest + dodir /usr/$(get_libdir)/blas/mkl dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so dosym ../../../../opt/intel/oneapi/mkl/$(ver_cut 1-3)/lib/intel64/libmkl_rt.so usr/$(get_libdir)/blas/mkl/libblas.so.3