commit: 97a8f7c1c9948ef28eb5a5c2466f0fd0f521d0dd
Author: Ted Tanberry <ted.tanberry <AT> gmail <DOT> com>
AuthorDate: Wed Dec 2 19:29:37 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec 2 19:29:37 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=97a8f7c1
sci-libs/lapack-reference: update pkg-config handling
.../files/lapack-fix-build-system.patch | 92 ++++++++++++++++++++++
.../lapack-reference/lapack-reference-3.6.0.ebuild | 13 ++-
2 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
new file mode 100644
index 0000000..8661709
--- /dev/null
+++ b/sci-libs/lapack-reference/files/lapack-fix-build-system.patch
@@ -0,0 +1,92 @@
+--- lapack-3.6.0/BLAS/blas.pc.in
++++ lapack-3.6.0/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: Basic Linear Algebra Subprograms F77 reference implementations
+--- lapack-3.6.0/BLAS/CMakeLists.txt
++++ lapack-3.6.0/BLAS/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ if(BUILD_TESTING)
+ add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/blas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/blas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/blas.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/blas.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CBLAS/cblas.pc.in
++++ lapack-3.6.0/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: lapacke
+ Description: C Standard Interface to BLAS Linear Algebra PACKage
+--- lapack-3.6.0/CBLAS/CMakeLists.txt
++++ lapack-3.6.0/CBLAS/CMakeLists.txt
+@@ -71,7 +71,7 @@
+ ${LAPACK_BINARY_DIR}/cblas-config.cmake @ONLY)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cblas.pc.in
${CMAKE_CURRENT_BINARY_DIR}/cblas.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/cblas.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/CMakeLists.txt
++++ lapack-3.6.0/CMakeLists.txt
+@@ -333,7 +333,7 @@
+ ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapack.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/lapack.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/CMakeLists.txt
++++ lapack-3.6.0/LAPACKE/CMakeLists.txt
+@@ -65,7 +65,7 @@
+ endif(BUILD_TESTING)
+
+
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapacke.pc.in
${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc @ONLY)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/lapacke.pc
+ DESTINATION ${PKG_CONFIG_DIR}
+--- lapack-3.6.0/LAPACKE/lapacke.pc.in
++++ lapack-3.6.0/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
+--- lapack-3.6.0/lapack.pc.in
++++ lapack-3.6.0/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
diff --git a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
index ac88f98..c06fe42 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
NUMERIC_MODULE_NAME="reflapack"
-inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild
python-any-r1
+inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild
python-any-r1 eutils
MY_PN=lapack
MYP=${MY_PN}-${PV}
@@ -32,10 +32,15 @@ DEPEND="${RDEPEND}
test? ( ${PYTHON_DEPS} )"
S="${WORKDIR}/${MYP}"
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
src_prepare() {
numeric-int64_ensure_blas_int_support
+ # the lapack(e)/(c)blas build system is somewhat broken
+ # with respect to its pkg-config files.
+ epatch "${PATCHES[@]}"
+
# rename library to avoid collision with other lapack implementations
# ${PROFNAME}, ${LIBNAME} and ${BLAS_REQUIRES} are not defined here,
they
# are in single quotes in the following seds. They are set later by
@@ -50,9 +55,9 @@ src_prepare() {
-e '/PROPERTIES/s:lapack:${LIBNAME}:g' \
SRC/CMakeLists.txt || die
sed -i \
- -e '/Name: /s:lapack:${PROFNAME}:' \
- -e 's:-llapack:-l${LIBNAME}:g' \
- -e '/Requires:
/s:blas:${BLAS_REQUIRES}\nFflags=${LAPACK_PKGCONFIG_FFLAGS}:' \
+ -e '/Name: /s:lapack:@PROFNAME@:' \
+ -e 's:-llapack:-l@LIBNAME@:g' \
+ -e '/Requires: /s:blas:@BLAS_REQUIRES@\nFflags\:
${LAPACK_PKGCONFIG_FFLAGS}:' \
lapack.pc.in || die
# some string does not get passed properly
sed -i \
