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 11EB8138334 for ; Wed, 24 Jul 2019 14:09:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21C2FE079E; Wed, 24 Jul 2019 14:09:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 E80D5E079E for ; Wed, 24 Jul 2019 14:09:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 ECFAE348502 for ; Wed, 24 Jul 2019 14:09:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 771D6720 for ; Wed, 24 Jul 2019 14:09:06 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1563977293.1026670c08c3b7bbc801565e9f36feb8e15fcc50.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/openblas/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/openblas/metadata.xml sci-libs/openblas/openblas-0.3.6.ebuild X-VCS-Directories: sci-libs/openblas/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 1026670c08c3b7bbc801565e9f36feb8e15fcc50 X-VCS-Branch: master Date: Wed, 24 Jul 2019 14:09:06 +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: 2856b2dc-93e7-405a-a67a-2ebad5e4aaf5 X-Archives-Hash: b87a0e775303be65e433437eca8c8447 commit: 1026670c08c3b7bbc801565e9f36feb8e15fcc50 Author: Mo Zhou gmail com> AuthorDate: Mon Jul 22 11:47:17 2019 +0000 Commit: Benda XU gentoo org> CommitDate: Wed Jul 24 14:08:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1026670c sci-libs/openblas-0.3.6: add index-64bit support. Closes: https://github.com/gentoo/gentoo/pull/12475 Signed-off-by: Mo Zhou gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/openblas/metadata.xml | 1 + sci-libs/openblas/openblas-0.3.6.ebuild | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml index 987eb126d9c..95b34d1ccda 100644 --- a/sci-libs/openblas/metadata.xml +++ b/sci-libs/openblas/metadata.xml @@ -17,6 +17,7 @@ Build with pthread threadding model Build without multi-thraedding Enable BLAS/LAPACK runtime switching + Compile a separate INTERFACE64 OpenBLAS xianyi/OpenBLAS diff --git a/sci-libs/openblas/openblas-0.3.6.ebuild b/sci-libs/openblas/openblas-0.3.6.ebuild index ba14ee30b53..19c3b79f258 100644 --- a/sci-libs/openblas/openblas-0.3.6.ebuild +++ b/sci-libs/openblas/openblas-0.3.6.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs DESCRIPTION="Optimized BLAS library based on GotoBLAS2" HOMEPAGE="http://xianyi.github.com/OpenBLAS/" @@ -10,7 +11,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/tarball/v${PV} -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="dynamic openmp pthread serial static-libs eselect-ldso" +IUSE="dynamic openmp pthread serial static-libs eselect-ldso index-64bit" REQUIRED_USE="?? ( openmp pthread serial )" RDEPEND=" @@ -27,6 +28,7 @@ openblas_flags() { use dynamic && \ flags+=( DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1 ) if use openmp; then + tc-check-openmp flags+=( USE_THREAD=1 USE_OPENMP=1 ) elif use pthread; then flags+=( USE_THREAD=1 USE_OPENMP=0 ) @@ -41,13 +43,18 @@ openblas_flags() { src_unpack () { default - find "${WORKDIR}" -maxdepth 1 -type d -name \*OpenBLAS\* && \ - mv "${WORKDIR}"/*OpenBLAS* "${S}" || die + mv "${WORKDIR}"/*OpenBLAS* "${S}" || die + if use index-64bit; then + cp -aL "${S}" "${S}-index-64bit" || die + fi } src_compile () { emake $(openblas_flags) emake -Cinterface shared-blas-lapack $(openblas_flags) + if use index-64bit; then + emake -C"${S}-index-64bit" $(openblas_flags) INTERFACE64=1 LIBPREFIX=libopenblas64 + fi } src_install () { @@ -66,6 +73,11 @@ src_install () { doins interface/liblapack.so.3 dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so fi + + if use index-64bit; then + insinto /usr/$(get_libdir)/ + dolib.so "${S}-index-64bit"/libopenblas64*.so* + fi } pkg_postinst () {