* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cblas-reference/, sci-libs/cblas-reference/files/
@ 2017-02-03 3:02 Matthias Maier
0 siblings, 0 replies; 2+ messages in thread
From: Matthias Maier @ 2017-02-03 3:02 UTC (permalink / raw
To: gentoo-commits
commit: b5a08d0b13c6c45986c8ae51d4b219041c1e86f7
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 02:14:29 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 03:01:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5a08d0b
sci-libs/cblas-reference: version bump to 20161223 (3.7.0)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/cblas-reference/Manifest | 1 +
.../cblas-reference-20161223.ebuild | 95 ++++++++++++++++++++++
.../lapack-reference-3.7.0-fix-build-system.patch | 56 +++++++++++++
3 files changed, 152 insertions(+)
diff --git a/sci-libs/cblas-reference/Manifest b/sci-libs/cblas-reference/Manifest
index e6e6a59..c6a06b6 100644
--- a/sci-libs/cblas-reference/Manifest
+++ b/sci-libs/cblas-reference/Manifest
@@ -1,2 +1,3 @@
DIST cblas.tgz 197694 SHA256 9b49d7177fda62b6141bf2ca29e475e86f0b12d8f72e0b944058d02b439dd52a SHA512 8edc4f939d36e6bb9bcbc4ffe414b6c991192ef2e76ec4eda16d3578591185d31e46be5e747d74c740411db6bd2c2d414a18f73193d4a288e8c7e4b83cb0895d WHIRLPOOL e3f9f2b6a58f000ac2dc02326cd5a41f8a5cc1437035e710c49eb2ff8b366906c099285c982394e69082d861be16cacd8bef2c3191d84dcace120b5d73623915
DIST lapack-3.6.0.tgz 6792324 SHA256 a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233ffc3 SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8 WHIRLPOOL 5576d0a81b2645fe95ef7011cc398f31142b8dcd01cdf5945e3db0e73ae1768766ea54254b40f4c6a581a6fb77b911595fccd597be0536833118af5877bb0c64
+DIST lapack-3.7.0.tgz 7359812 SHA256 ed967e4307e986474ab02eb810eed1d1adc73f5e1e3bc78fb009f6fe766db3be SHA512 e4f4c7d0ba8a096eeb813160c6dbcdd535647df6b2ad5beac9181908158956b31d1a9554ec9b9836fd44fe7404c1f377b297cbb20d744f20d70e357fd246c91b WHIRLPOOL d536508015e081395bda83b84bf4e5b1d6e8e517ea38f6afcaf40e96d892b26b8b1034954d5cd79cce5033d6653e178b5d27a46deecfa7466cd0bdaafcf9f18f
diff --git a/sci-libs/cblas-reference/cblas-reference-20161223.ebuild b/sci-libs/cblas-reference/cblas-reference-20161223.ebuild
new file mode 100644
index 00000000..8492f87
--- /dev/null
+++ b/sci-libs/cblas-reference/cblas-reference-20161223.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
+
+LPN=lapack
+LPV=3.7.0
+
+DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
+HOMEPAGE="http://www.netlib.org/cblas/"
+SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="app-eselect/eselect-cblas
+ >=virtual/blas-3.6
+ virtual/pkgconfig"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${LPN}-${LPV}"
+PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+
+ eapply_user
+
+ ESELECT_PROF=reference
+
+ cp "${FILESDIR}"/eselect.cblas.reference-r2 "${T}"/eselect.cblas.reference || die
+ sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+ "${T}"/eselect.cblas.reference || die
+ fi
+
+ sed -i \
+ -e 's:/CMAKE/:/cmake/:g' \
+ CBLAS/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Wno-dev
+ -DCBLAS=ON
+ -DUSE_OPTIMIZED_BLAS=ON
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+ -DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) ${CFLAGS}"
+ -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_STATIC_LIBS=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile -C CBLAS
+}
+
+src_install() {
+ cmake-utils_src_install -C CBLAS
+
+ mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
+ mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/include"/cblas* \
+ "${ED}/usr/$(get_libdir)/pkgconfig"/* \
+ "${ED}/usr/$(get_libdir)/blas/reference" || die
+
+ rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
+ rmdir "${ED}/usr/include" || die
+
+ eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+ local p=cblas
+ local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+ if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+ # work around eselect bug #189942
+ local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+ [[ -e ${configfile} ]] && rm -f ${configfile}
+ eselect ${p} set ${ESELECT_PROF}
+ elog "${p} has been eselected to ${ESELECT_PROF}"
+ else
+ elog "Current eselected ${p} is ${current_lib}"
+ elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+ elog "\t eselect ${p} set ${ESELECT_PROF}"
+ fi
+}
diff --git a/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
new file mode 100644
index 00000000..70f7cb0
--- /dev/null
+++ b/sci-libs/cblas-reference/files/lapack-reference-3.7.0-fix-build-system.patch
@@ -0,0 +1,56 @@
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+index 7fd6f1e..e52f3ad 100644
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+
+ Name: BLAS
+ Description: FORTRAN reference implementation of BLAS Basic Linear Algebra Subprograms
+diff --git a/CBLAS/cblas.pc.in b/CBLAS/cblas.pc.in
+index 4a938fe..311aed9 100644
+--- a/CBLAS/cblas.pc.in
++++ b/CBLAS/cblas.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+
+ Name: CBLAS
+ Description: C Standard Interface to BLAS Basic Linear Algebra Subprograms
+diff --git a/LAPACKE/lapacke.pc.in b/LAPACKE/lapacke.pc.in
+index 028f8da..dc092b1 100644
+--- a/LAPACKE/lapacke.pc.in
++++ b/LAPACKE/lapacke.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+
+ Name: LAPACKE
+ Description: C Standard Interface to LAPACK Linear Algebra PACKage
+diff --git a/lapack.pc.in b/lapack.pc.in
+index 878efc2..2cca4c2 100644
+--- a/lapack.pc.in
++++ b/lapack.pc.in
+@@ -1,5 +1,7 @@
+-prefix=@prefix@
+-libdir=@libdir@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+
+ Name: LAPACK
+ Description: FORTRAN reference implementation of LAPACK Linear Algebra PACKage
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/cblas-reference/, sci-libs/cblas-reference/files/
@ 2017-02-03 3:02 Matthias Maier
0 siblings, 0 replies; 2+ messages in thread
From: Matthias Maier @ 2017-02-03 3:02 UTC (permalink / raw
To: gentoo-commits
commit: 93ed37b39ae9df065e3c046e07f6651df85e1a56
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 02:12:28 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 03:01:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ed37b3
sci-libs/cblas-reference: versionize patch
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild | 4 ++--
...ild-system.patch => lapack-reference-3.6.0-fix-build-system.patch} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild b/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
index c2ecde1..8ba3369 100644
--- a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
+++ b/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,7 +24,7 @@ DEPEND="app-eselect/eselect-cblas
RDEPEND="${DEPEND}"
S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
+PATCHES=( "${FILESDIR}/lapack-reference-${LPV}-fix-build-system.patch" )
src_prepare() {
epatch "${PATCHES[@]}"
diff --git a/sci-libs/cblas-reference/files/lapack-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
similarity index 100%
rename from sci-libs/cblas-reference/files/lapack-fix-build-system.patch
rename to sci-libs/cblas-reference/files/lapack-reference-3.6.0-fix-build-system.patch
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-03 3:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-03 3:02 [gentoo-commits] repo/gentoo:master commit in: sci-libs/cblas-reference/, sci-libs/cblas-reference/files/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2017-02-03 3:02 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox