public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/, sci-libs/lapacke-reference/files/
@ 2012-04-25 16:10 Sebastien Fabbro
  0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2012-04-25 16:10 UTC (permalink / raw
  To: gentoo-commits

commit:     72e117a0d6caeee73c92729547a6e3a51f38f8d8
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Wed Apr 25 16:05:28 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Apr 25 16:05:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=72e117a0

fixed patch for testing

---
 ...{3.4.1-cmake.patch => lapack-3.4.1-cmake.patch} |   23 ++++--
 .../lapacke-reference-3.4.0_p20120215-r1.ebuild    |   79 --------------------
 .../lapacke-reference-3.4.1.ebuild                 |    2 +-
 3 files changed, 17 insertions(+), 87 deletions(-)

diff --git a/sci-libs/lapacke-reference/files/3.4.1-cmake.patch b/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch
similarity index 93%
rename from sci-libs/lapacke-reference/files/3.4.1-cmake.patch
rename to sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch
index 465f68a..78dece8 100644
--- a/sci-libs/lapacke-reference/files/3.4.1-cmake.patch
+++ b/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch
@@ -1,6 +1,6 @@
 Index: CMakeLists.txt
 ===================================================================
---- CMakeLists.txt	(revision 1284)
+--- CMakeLists.txt	(revision 1294)
 +++ CMakeLists.txt	(working copy)
 @@ -94,10 +94,6 @@
  # Precision to build
@@ -125,7 +125,7 @@ Index: CMakeLists.txt
  configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
 Index: lapacke/example/CMakeLists.txt
 ===================================================================
---- lapacke/example/CMakeLists.txt	(revision 1284)
+--- lapacke/example/CMakeLists.txt	(revision 1294)
 +++ lapacke/example/CMakeLists.txt	(working copy)
 @@ -1,8 +1,8 @@
  add_executable(xexample_DGESV_rowmajor example_DGESV_rowmajor.c)
@@ -140,7 +140,7 @@ Index: lapacke/example/CMakeLists.txt
  add_test(example_ZGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_ZGESV_rowmajor)
 Index: lapacke/CMakeLists.txt
 ===================================================================
---- lapacke/CMakeLists.txt	(revision 1284)
+--- lapacke/CMakeLists.txt	(revision 1294)
 +++ lapacke/CMakeLists.txt	(working copy)
 @@ -45,14 +45,14 @@
  
@@ -162,7 +162,7 @@ Index: lapacke/CMakeLists.txt
  
 Index: TESTING/LIN/CMakeLists.txt
 ===================================================================
---- TESTING/LIN/CMakeLists.txt	(revision 1284)
+--- TESTING/LIN/CMakeLists.txt	(revision 1294)
 +++ TESTING/LIN/CMakeLists.txt	(working copy)
 @@ -193,7 +193,7 @@
  
@@ -175,7 +175,7 @@ Index: TESTING/LIN/CMakeLists.txt
  IF(BUILD_SINGLE)
 Index: TESTING/EIG/CMakeLists.txt
 ===================================================================
---- TESTING/EIG/CMakeLists.txt	(revision 1284)
+--- TESTING/EIG/CMakeLists.txt	(revision 1294)
 +++ TESTING/EIG/CMakeLists.txt	(working copy)
 @@ -119,7 +119,7 @@
  
@@ -188,10 +188,19 @@ Index: TESTING/EIG/CMakeLists.txt
  if (BUILD_SINGLE)
 Index: TESTING/MATGEN/CMakeLists.txt
 ===================================================================
---- TESTING/MATGEN/CMakeLists.txt	(revision 1284)
+--- TESTING/MATGEN/CMakeLists.txt	(revision 1294)
 +++ TESTING/MATGEN/CMakeLists.txt	(working copy)
-@@ -71,5 +71,5 @@
+@@ -64,12 +64,12 @@
+   set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
+ endif()
+ 
+-list(REMOVE_DUPLICATES ALLOBJ)
+-
+ if (NOT ALLOBJ)
+ set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
    ${DZATGEN})
++else()
++  list(REMOVE_DUPLICATES ALLOBJ)
  endif()
  add_library(tmglib ${ALLOBJ} )
 -target_link_libraries(tmglib lapack)

diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.4.0_p20120215-r1.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.4.0_p20120215-r1.ebuild
deleted file mode 100644
index 104e458..0000000
--- a/sci-libs/lapacke-reference/lapacke-reference-3.4.0_p20120215-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit cmake-utils fortran-2 alternatives-2
-
-MYP=lapack-${PV}
-
-DESCRIPTION="C Interface to LAPACK"
-HOMEPAGE="http://www.netlib.org/lapack/"
-#SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
-SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${MYP}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs test xblas"
-
-RDEPEND="virtual/blas
-	virtual/lapack
-	xblas? ( sci-libs/xblas )"
-DEPEND="${RDEPEND}
-	test? ( virtual/fortran )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
-	use test && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	use static-libs && mkdir "${WORKDIR}/${PN}_static"
-}
-
-src_configure() {
-	lapack_configure() {
-		local mycmakeargs=(
-			-DUSE_OPTIMIZED_BLAS=ON
-			-DUSE_OPTIMIZED_LAPACK=ON
-			-DLAPACKE=ON
-			-DBLAS_LIBRARIES="$(pkg-config --libs blas)"
-			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
-			$(cmake-utils_use_build test TESTING)
-			$(cmake-utils_use_use xblas XBLAS)
-			$@
-		)
-		cmake-utils_src_configure
-	}
-
-	lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
-	use static-libs && \
-		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \
-		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
-}
-
-src_compile() {
-	use test && cmake-utils_src_compile -C TESTING/MATGEN
-	cmake-utils_src_compile -C lapacke
-	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-			cmake-utils_src_compile -C lapacke
-}
-
-src_test() {
-	pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null
-	local ctestargs
-	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-	ctest ${ctestargs} || die
-	popd > /dev/null
-}
-
-src_install() {
-	cmake-utils_src_install -C lapacke
-	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
-		cmake-utils_src_install -C lapacke
-	alternatives_for lapacke reference 0 \
-		/usr/$(get_libdir)/pkgconfig/lapacke.pc reflapacke.pc
-}

diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild
index bb30d09..213e4cb 100644
--- a/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-cmake.patch
+	epatch "${FILESDIR}"/${MYP}-cmake.patch
 	use static-libs && mkdir "${WORKDIR}/${PN}_static"
 }
 



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/, sci-libs/lapacke-reference/files/
@ 2015-12-03  9:55 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-12-03  9:55 UTC (permalink / raw
  To: gentoo-commits

commit:     de1ee726a764f5ef9f6bc3f15d9986c0865b002a
Author:     Ted Tanberry <ted.tanberry <AT> gmail <DOT> com>
AuthorDate: Wed Dec  2 19:30:56 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec  2 19:30:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=de1ee726

sci-libs/lapacke-reference: update pkg-config handling

 .../files/lapack-fix-build-system.patch            | 92 ++++++++++++++++++++++
 .../lapacke-reference-3.6.0.ebuild                 |  5 ++
 2 files changed, 97 insertions(+)

diff --git a/sci-libs/lapacke-reference/files/lapack-fix-build-system.patch b/sci-libs/lapacke-reference/files/lapack-fix-build-system.patch
new file mode 100644
index 0000000..8661709
--- /dev/null
+++ b/sci-libs/lapacke-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/lapacke-reference/lapacke-reference-3.6.0.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.6.0.ebuild
index 2cefa53..4e7f5b7 100644
--- a/sci-libs/lapacke-reference/lapacke-reference-3.6.0.ebuild
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.6.0.ebuild
@@ -28,8 +28,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${MYP}"
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
 
 src_prepare() {
+	# the lapack(e)/(c)blas build system is somewhat broken
+	# with respect to its pkg-config files.
+	epatch "${PATCHES[@]}"
+
 	# rename libraries to avoid collision with other lapacke
 	sed -i \
 		-e 's:BINARY_DIR}/lapacke.pc:BINARY_DIR}/reflapacke.pc:' \


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/, sci-libs/lapacke-reference/files/
@ 2015-12-03  9:54 Justin Lecher
  0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-12-03  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     b099be35d50dc30d2a08fe860d3f5d5950dde8ba
Author:     Ted Tanberry <ted.tanberry <AT> gmail <DOT> com>
AuthorDate: Wed Dec  2 19:30:56 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 09:42:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b099be35

sci-libs/lapacke-reference: update pkg-config handling

 .../files/lapack-fix-build-system.patch            | 92 ++++++++++++++++++++++
 .../lapacke-reference-3.6.0.ebuild                 |  5 ++
 2 files changed, 97 insertions(+)

diff --git a/sci-libs/lapacke-reference/files/lapack-fix-build-system.patch b/sci-libs/lapacke-reference/files/lapack-fix-build-system.patch
new file mode 100644
index 0000000..8661709
--- /dev/null
+++ b/sci-libs/lapacke-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/lapacke-reference/lapacke-reference-3.6.0.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.6.0.ebuild
index 2cefa53..4e7f5b7 100644
--- a/sci-libs/lapacke-reference/lapacke-reference-3.6.0.ebuild
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.6.0.ebuild
@@ -28,8 +28,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${MYP}"
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
 
 src_prepare() {
+	# the lapack(e)/(c)blas build system is somewhat broken
+	# with respect to its pkg-config files.
+	epatch "${PATCHES[@]}"
+
 	# rename libraries to avoid collision with other lapacke
 	sed -i \
 		-e 's:BINARY_DIR}/lapacke.pc:BINARY_DIR}/reflapacke.pc:' \


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/, sci-libs/lapacke-reference/files/
@ 2013-05-23  5:13 Sebastien Fabbro
  0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2013-05-23  5:13 UTC (permalink / raw
  To: gentoo-commits

commit:     edbd0f3b68f9aed18d857108fa9ab72dfebac70e
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 05:13:31 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu May 23 05:13:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=edbd0f3b

sci-libs/lapacke-reference: Switch to EAPI5

Package-Manager: portage-2.2.01.21938-prefix

---
 sci-libs/lapacke-reference/ChangeLog               |    6 +-
 .../files/lapack-3.4.1-cmake.patch                 |  208 --------------------
 .../lapacke-reference-3.4.2.ebuild                 |    6 +-
 3 files changed, 8 insertions(+), 212 deletions(-)

diff --git a/sci-libs/lapacke-reference/ChangeLog b/sci-libs/lapacke-reference/ChangeLog
index a26b128..5efd3ad 100644
--- a/sci-libs/lapacke-reference/ChangeLog
+++ b/sci-libs/lapacke-reference/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/lapacke-reference
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 May 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/lapack-3.4.1-cmake.patch, lapacke-reference-3.4.2.ebuild:
+  sci-libs/lapacke-reference: Switch to EAPI5
+
   29 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org>
   -lapacke-reference-3.4.1.ebuild, lapacke-reference-3.4.2.ebuild, metadata.xml:
   sci-libs/lapacke-reference: added tmg for testing, cleaning up ebuild

diff --git a/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch b/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch
deleted file mode 100644
index 78dece8..0000000
--- a/sci-libs/lapacke-reference/files/lapack-3.4.1-cmake.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt	(revision 1294)
-+++ CMakeLists.txt	(working copy)
-@@ -94,10 +94,6 @@
- # Precision to build
- # By default all precisions are generated
- 
--option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
--option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
--option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
--option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
- 
- # --------------------------------------------------
- # Subdirectories that need to be processed
-@@ -147,7 +143,49 @@
-   find_library(XBLAS_LIBRARY NAMES xblas)
- endif(USE_XBLAS)
-    
--add_subdirectory(SRC)
-+option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
-+
-+# Check the usage of the user provided LAPACK libraries
-+if(LAPACK_LIBRARIES)
-+  include(CheckFortranFunctionExists)
-+  set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
-+  CHECK_FORTRAN_FUNCTION_EXISTS("dpotrf" LAPACK_FOUND)
-+  unset( CMAKE_REQUIRED_LIBRARIES )
-+  if(LAPACK_FOUND)
-+    message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
-+  else(LAPACK_FOUND)
-+    message(ERROR "--> LAPACK supplied by user is not WORKING, CANNOT USE $LAPACK_LIBRARIES}.")
-+    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
-+    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
-+    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
-+  endif(LAPACK_FOUND)
-+  
-+  # User did not provide a LAPACK Library but specified to search for one
-+elseif( USE_OPTIMIZED_LAPACK )
-+  find_package( LAPACK )
-+endif (LAPACK_LIBRARIES)
-+
-+# Neither user specified or optimized LAPACK libraries can be used
-+if(NOT LAPACK_FOUND)
-+  message(STATUS "Using supplied NETLIB LAPACK implementation")
-+  set( LAPACK_LIBRARIES lapack )
-+  option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
-+  option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
-+  option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
-+  option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
-+  add_subdirectory(SRC)
-+else()
-+  set( CMAKE_EXE_LINKER_FLAGS 
-+    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for executables" FORCE)
-+  set( CMAKE_MODULE_LINKER_FLAGS 
-+    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for modules" FORCE)
-+  set( CMAKE_SHARED_LINKER_FLAGS 
-+    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
-+    CACHE STRING "Linker flags for shared libs" FORCE)
-+endif( NOT LAPACK_FOUND )
-+
- if(BUILD_TESTING)
-   add_subdirectory(TESTING)
- endif(BUILD_TESTING)
-@@ -155,6 +193,10 @@
- # --------------------------------------------------
- # LAPACKE
- option(LAPACKE "Build LAPACKE" OFF)
-+if(LAPACKE)
-+  add_subdirectory(lapacke)
-+endif(LAPACKE)
-+
- # LAPACKE has also the interface to some routines from tmglib,
- # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
- option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
-@@ -162,9 +204,6 @@
-   option(LAPACKE "Build LAPACKE" ON)
- endif(LAPACKE_WITH_TMG)
- 
--if(LAPACKE)
--  add_subdirectory(lapacke)
--endif(LAPACKE)
- 
- # --------------------------------------------------
- # CPACK Packaging 
-@@ -202,20 +241,24 @@
- OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
- #OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
- 
--if( NOT BLAS_FOUND )
--  if(LAPACKE)
--     export(TARGETS blas lapack tmglib lapacke FILE lapack-targets.cmake)
--  else (LAPACKE)
--     export(TARGETS blas lapack tmglib FILE lapack-targets.cmake)
--  endif(LAPACKE)
--else( NOT BLAS_FOUND )
--  if(LAPACKE)
--     export(TARGETS lapack tmglib lapacke FILE lapack-targets.cmake)
--  else (LAPACKE)
--     export(TARGETS lapack tmglib FILE lapack-targets.cmake)
--  endif(LAPACKE)
--endif( NOT BLAS_FOUND )
-+if(NOT BLAS_FOUND)
-+  set(ALL_TARGETS ${ALL_TARGETS} blas)
-+endif(NOT BLAS_FOUND)
- 
-+if(NOT LAPACK_FOUND)
-+  set(ALL_TARGETS ${ALL_TARGETS} lapack)
-+endif(NOT LAPACK_FOUND)
-+
-+if(BUILD_TESTING OR LAPACKE_WITH_TMG)
-+  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
-+endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
-+
-+if(LAPACKE)
-+  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
-+endif(LAPACKE)
-+
-+export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
-+
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-version.cmake.in
-   ${LAPACK_BINARY_DIR}/lapack-config-version.cmake @ONLY)
- configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
-Index: lapacke/example/CMakeLists.txt
-===================================================================
---- lapacke/example/CMakeLists.txt	(revision 1294)
-+++ lapacke/example/CMakeLists.txt	(working copy)
-@@ -1,8 +1,8 @@
- add_executable(xexample_DGESV_rowmajor example_DGESV_rowmajor.c)
- add_executable(xexample_ZGESV_rowmajor example_ZGESV_rowmajor.c)
- 
--target_link_libraries(xexample_DGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
--target_link_libraries(xexample_ZGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
-+target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-+target_link_libraries(xexample_ZGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
- 
- add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
- add_test(example_ZGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_ZGESV_rowmajor)
-Index: lapacke/CMakeLists.txt
-===================================================================
---- lapacke/CMakeLists.txt	(revision 1294)
-+++ lapacke/CMakeLists.txt	(working copy)
-@@ -45,14 +45,14 @@
- 
- if (USE_XBLAS)
-    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES}  ${XBLAS_LIBRARY})
-+   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
- else (USE_XBLAS)
-   if (LAPACKE_WITH_TMG)
-    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke tmglib lapack ${BLAS_LIBRARIES} )
-+   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-   else (LAPACKE_WITH_TMG)
-    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
--   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES} )
-+   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
-   endif(LAPACKE_WITH_TMG)
- endif(USE_XBLAS)
- 
-Index: TESTING/LIN/CMakeLists.txt
-===================================================================
---- TESTING/LIN/CMakeLists.txt	(revision 1294)
-+++ TESTING/LIN/CMakeLists.txt	(working copy)
-@@ -193,7 +193,7 @@
- 
- macro(add_lin_executable name )
-   add_executable(${name} ${ARGN})
--  target_link_libraries(${name} tmglib lapack)
-+  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
- endmacro(add_lin_executable)
- 
- IF(BUILD_SINGLE)
-Index: TESTING/EIG/CMakeLists.txt
-===================================================================
---- TESTING/EIG/CMakeLists.txt	(revision 1294)
-+++ TESTING/EIG/CMakeLists.txt	(working copy)
-@@ -119,7 +119,7 @@
- 
- macro(add_eig_executable name )
-   add_executable(${name} ${ARGN})
--  target_link_libraries(${name} tmglib lapack )
-+  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
- endmacro(add_eig_executable)
- 
- if (BUILD_SINGLE)
-Index: TESTING/MATGEN/CMakeLists.txt
-===================================================================
---- TESTING/MATGEN/CMakeLists.txt	(revision 1294)
-+++ TESTING/MATGEN/CMakeLists.txt	(working copy)
-@@ -64,12 +64,12 @@
-   set(ALLOBJ ${ALLOBJ} ${ZMATGEN} ${DZATGEN})
- endif()
- 
--list(REMOVE_DUPLICATES ALLOBJ)
--
- if (NOT ALLOBJ)
- set(ALLOBJ ${SMATGEN} ${CMATGEN} ${SCATGEN} ${DMATGEN} ${ZMATGEN}
-   ${DZATGEN})
-+else()
-+  list(REMOVE_DUPLICATES ALLOBJ)
- endif()
- add_library(tmglib ${ALLOBJ} )
--target_link_libraries(tmglib lapack)
-+target_link_libraries(tmglib ${LAPACK_LIBRARIES})
- lapack_install_library(tmglib)

diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild
index f8224d4..cdf324a 100644
--- a/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit alternatives-2 cmake-utils eutils fortran-2 toolchain-funcs
 
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	# avoid collision with other lapack
+	# rename libraries to avoid collision with other lapacke
 	sed -i \
 		-e 's:BINARY_DIR}/lapacke.pc:BINARY_DIR}/reflapacke.pc:' \
 		-e '/export/s:lapacke:reflapacke:g' \


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/, sci-libs/lapacke-reference/files/
@ 2012-04-23 18:43 Sebastien Fabbro
  0 siblings, 0 replies; 5+ messages in thread
From: Sebastien Fabbro @ 2012-04-23 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     04534a273bd28334ba5e041871ce23e2a0ceff26
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Mon Apr 23 18:43:29 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 18:43:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=04534a27

sci-libs/lapacke-reference: Version bump

(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/lapacke-reference/ChangeLog               |    6 +
 sci-libs/lapacke-reference/files/3.4.1-cmake.patch |  199 ++++++++++++++++++++
 .../lapacke-reference-3.4.1.ebuild                 |   75 ++++++++
 3 files changed, 280 insertions(+), 0 deletions(-)

diff --git a/sci-libs/lapacke-reference/ChangeLog b/sci-libs/lapacke-reference/ChangeLog
index 2d9e3b6..7956248 100644
--- a/sci-libs/lapacke-reference/ChangeLog
+++ b/sci-libs/lapacke-reference/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*lapacke-reference-3.4.1 (23 Apr 2012)
+
+  23 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/3.4.1-cmake.patch, +lapacke-reference-3.4.1.ebuild:
+  Version bump
+
   23 Feb 2012; Justin Lecher <jlec@gentoo.org>
   lapacke-reference-3.4.0_p20120215-r1.ebuild, metadata.xml:
   Keyworded for ~-linux prefix

diff --git a/sci-libs/lapacke-reference/files/3.4.1-cmake.patch b/sci-libs/lapacke-reference/files/3.4.1-cmake.patch
new file mode 100644
index 0000000..465f68a
--- /dev/null
+++ b/sci-libs/lapacke-reference/files/3.4.1-cmake.patch
@@ -0,0 +1,199 @@
+Index: CMakeLists.txt
+===================================================================
+--- CMakeLists.txt	(revision 1284)
++++ CMakeLists.txt	(working copy)
+@@ -94,10 +94,6 @@
+ # Precision to build
+ # By default all precisions are generated
+ 
+-option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
+-option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
+-option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
+-option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
+ 
+ # --------------------------------------------------
+ # Subdirectories that need to be processed
+@@ -147,7 +143,49 @@
+   find_library(XBLAS_LIBRARY NAMES xblas)
+ endif(USE_XBLAS)
+    
+-add_subdirectory(SRC)
++option(USE_OPTIMIZED_LAPACK "Whether or not to use an optimized LAPACK library instead of included netlib LAPACK" OFF)
++
++# Check the usage of the user provided LAPACK libraries
++if(LAPACK_LIBRARIES)
++  include(CheckFortranFunctionExists)
++  set(CMAKE_REQUIRED_LIBRARIES ${LAPACK_LIBRARIES})
++  CHECK_FORTRAN_FUNCTION_EXISTS("dpotrf" LAPACK_FOUND)
++  unset( CMAKE_REQUIRED_LIBRARIES )
++  if(LAPACK_FOUND)
++    message(STATUS "--> LAPACK supplied by user is WORKING, will use ${LAPACK_LIBRARIES}.")
++  else(LAPACK_FOUND)
++    message(ERROR "--> LAPACK supplied by user is not WORKING, CANNOT USE $LAPACK_LIBRARIES}.")
++    message(ERROR "-->     Will use REFERENCE LAPACK (by default)")
++    message(ERROR "-->     Or Correct your LAPACK_LIBRARIES entry ")
++    message(ERROR "-->     Or Consider checking USE_OPTIMIZED_LAPACK")
++  endif(LAPACK_FOUND)
++  
++  # User did not provide a LAPACK Library but specified to search for one
++elseif( USE_OPTIMIZED_LAPACK )
++  find_package( LAPACK )
++endif (LAPACK_LIBRARIES)
++
++# Neither user specified or optimized LAPACK libraries can be used
++if(NOT LAPACK_FOUND)
++  message(STATUS "Using supplied NETLIB LAPACK implementation")
++  set( LAPACK_LIBRARIES lapack )
++  option(BUILD_SINGLE "Build LAPACK Single Precision" ON)
++  option(BUILD_DOUBLE "Build LAPACK Double Precision" ON)
++  option(BUILD_COMPLEX "Build LAPACK Complex Precision" ON)
++  option(BUILD_COMPLEX16 "Build LAPACK Double Complex Precision" ON)
++  add_subdirectory(SRC)
++else()
++  set( CMAKE_EXE_LINKER_FLAGS 
++    "${CMAKE_EXE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
++    CACHE STRING "Linker flags for executables" FORCE)
++  set( CMAKE_MODULE_LINKER_FLAGS 
++    "${CMAKE_MODULE_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
++    CACHE STRING "Linker flags for modules" FORCE)
++  set( CMAKE_SHARED_LINKER_FLAGS 
++    "${CMAKE_SHARED_LINKER_FLAGS} ${LAPACK_LINKER_FLAGS}" 
++    CACHE STRING "Linker flags for shared libs" FORCE)
++endif( NOT LAPACK_FOUND )
++
+ if(BUILD_TESTING)
+   add_subdirectory(TESTING)
+ endif(BUILD_TESTING)
+@@ -155,6 +193,10 @@
+ # --------------------------------------------------
+ # LAPACKE
+ option(LAPACKE "Build LAPACKE" OFF)
++if(LAPACKE)
++  add_subdirectory(lapacke)
++endif(LAPACKE)
++
+ # LAPACKE has also the interface to some routines from tmglib,
+ # if LAPACKE_WITH_TMG is selected, we need to add those routines to LAPACKE
+ option(LAPACKE_WITH_TMG "Build LAPACKE with tmglib routines" OFF)
+@@ -162,9 +204,6 @@
+   option(LAPACKE "Build LAPACKE" ON)
+ endif(LAPACKE_WITH_TMG)
+ 
+-if(LAPACKE)
+-  add_subdirectory(lapacke)
+-endif(LAPACKE)
+ 
+ # --------------------------------------------------
+ # CPACK Packaging 
+@@ -202,20 +241,24 @@
+ OPTION(BUILD_STATIC_LIBS "Build static libraries" ON )
+ #OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON )
+ 
+-if( NOT BLAS_FOUND )
+-  if(LAPACKE)
+-     export(TARGETS blas lapack tmglib lapacke FILE lapack-targets.cmake)
+-  else (LAPACKE)
+-     export(TARGETS blas lapack tmglib FILE lapack-targets.cmake)
+-  endif(LAPACKE)
+-else( NOT BLAS_FOUND )
+-  if(LAPACKE)
+-     export(TARGETS lapack tmglib lapacke FILE lapack-targets.cmake)
+-  else (LAPACKE)
+-     export(TARGETS lapack tmglib FILE lapack-targets.cmake)
+-  endif(LAPACKE)
+-endif( NOT BLAS_FOUND )
++if(NOT BLAS_FOUND)
++  set(ALL_TARGETS ${ALL_TARGETS} blas)
++endif(NOT BLAS_FOUND)
+ 
++if(NOT LAPACK_FOUND)
++  set(ALL_TARGETS ${ALL_TARGETS} lapack)
++endif(NOT LAPACK_FOUND)
++
++if(BUILD_TESTING OR LAPACKE_WITH_TMG)
++  set(ALL_TARGETS ${ALL_TARGETS} tmglib)
++endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
++
++if(LAPACKE)
++  set(ALL_TARGETS ${ALL_TARGETS} lapacke)
++endif(LAPACKE)
++
++export(TARGETS ${ALL_TARGETS} FILE lapack-targets.cmake)
++
+ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-version.cmake.in
+   ${LAPACK_BINARY_DIR}/lapack-config-version.cmake @ONLY)
+ configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
+Index: lapacke/example/CMakeLists.txt
+===================================================================
+--- lapacke/example/CMakeLists.txt	(revision 1284)
++++ lapacke/example/CMakeLists.txt	(working copy)
+@@ -1,8 +1,8 @@
+ add_executable(xexample_DGESV_rowmajor example_DGESV_rowmajor.c)
+ add_executable(xexample_ZGESV_rowmajor example_ZGESV_rowmajor.c)
+ 
+-target_link_libraries(xexample_DGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
+-target_link_libraries(xexample_ZGESV_rowmajor lapacke lapack ${BLAS_LIBRARIES})
++target_link_libraries(xexample_DGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
++target_link_libraries(xexample_ZGESV_rowmajor lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+ 
+ add_test(example_DGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_DGESV_rowmajor)
+ add_test(example_ZGESV_rowmajor ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/xexample_ZGESV_rowmajor)
+Index: lapacke/CMakeLists.txt
+===================================================================
+--- lapacke/CMakeLists.txt	(revision 1284)
++++ lapacke/CMakeLists.txt	(working copy)
+@@ -45,14 +45,14 @@
+ 
+ if (USE_XBLAS)
+    add_library(lapacke ${SRC_OBJ} ${SRCX_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES}  ${XBLAS_LIBRARY})
++   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+ else (USE_XBLAS)
+   if (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${MATGEN_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke tmglib lapack ${BLAS_LIBRARIES} )
++   target_link_libraries(lapacke tmglib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+   else (LAPACKE_WITH_TMG)
+    add_library(lapacke ${SRC_OBJ} ${UTILS_OBJ})
+-   target_link_libraries(lapacke lapack ${BLAS_LIBRARIES} )
++   target_link_libraries(lapacke ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
+   endif(LAPACKE_WITH_TMG)
+ endif(USE_XBLAS)
+ 
+Index: TESTING/LIN/CMakeLists.txt
+===================================================================
+--- TESTING/LIN/CMakeLists.txt	(revision 1284)
++++ TESTING/LIN/CMakeLists.txt	(working copy)
+@@ -193,7 +193,7 @@
+ 
+ macro(add_lin_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib lapack)
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
+ endmacro(add_lin_executable)
+ 
+ IF(BUILD_SINGLE)
+Index: TESTING/EIG/CMakeLists.txt
+===================================================================
+--- TESTING/EIG/CMakeLists.txt	(revision 1284)
++++ TESTING/EIG/CMakeLists.txt	(working copy)
+@@ -119,7 +119,7 @@
+ 
+ macro(add_eig_executable name )
+   add_executable(${name} ${ARGN})
+-  target_link_libraries(${name} tmglib lapack )
++  target_link_libraries(${name} tmglib ${LAPACK_LIBRARIES})
+ endmacro(add_eig_executable)
+ 
+ if (BUILD_SINGLE)
+Index: TESTING/MATGEN/CMakeLists.txt
+===================================================================
+--- TESTING/MATGEN/CMakeLists.txt	(revision 1284)
++++ TESTING/MATGEN/CMakeLists.txt	(working copy)
+@@ -71,5 +71,5 @@
+   ${DZATGEN})
+ endif()
+ add_library(tmglib ${ALLOBJ} )
+-target_link_libraries(tmglib lapack)
++target_link_libraries(tmglib ${LAPACK_LIBRARIES})
+ lapack_install_library(tmglib)

diff --git a/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild b/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild
new file mode 100644
index 0000000..bb30d09
--- /dev/null
+++ b/sci-libs/lapacke-reference/lapacke-reference-3.4.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit cmake-utils fortran-2 alternatives-2
+
+MYP=lapack-${PV}
+
+DESCRIPTION="C Interface to LAPACK"
+HOMEPAGE="http://www.netlib.org/lapack/"
+SRC_URI="http://www.netlib.org/lapack/${MYP}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test xblas"
+
+RDEPEND="virtual/blas
+	virtual/lapack
+	xblas? ( sci-libs/xblas )"
+DEPEND="${RDEPEND}
+	test? ( virtual/fortran )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-cmake.patch
+	use static-libs && mkdir "${WORKDIR}/${PN}_static"
+}
+
+src_configure() {
+	lapack_configure() {
+		local mycmakeargs=(
+			-DUSE_OPTIMIZED_BLAS=ON
+			-DUSE_OPTIMIZED_LAPACK=ON
+			-DLAPACKE=ON
+			-DBLAS_LIBRARIES="$(pkg-config --libs blas)"
+			-DLAPACK_LIBRARIES="$(pkg-config --libs lapack)"
+			$(cmake-utils_use_build test TESTING)
+			$(cmake-utils_use_use xblas XBLAS)
+			$@
+		)
+		cmake-utils_src_configure
+	}
+
+	lapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+	use static-libs && \
+		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" lapack_configure \
+		-DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+}
+
+src_compile() {
+	use test && cmake-utils_src_compile -C TESTING/MATGEN
+	cmake-utils_src_compile -C lapacke
+	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
+			cmake-utils_src_compile -C lapacke
+}
+
+src_test() {
+	pushd "${CMAKE_BUILD_DIR}/lapacke" > /dev/null
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+	ctest ${ctestargs} || die
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install -C lapacke
+	use static-libs && CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" \
+		cmake-utils_src_install -C lapacke
+	alternatives_for lapacke reference 0 \
+		/usr/$(get_libdir)/pkgconfig/lapacke.pc reflapacke.pc
+}



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-12-03  9:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-25 16:10 [gentoo-commits] proj/sci:master commit in: sci-libs/lapacke-reference/, sci-libs/lapacke-reference/files/ Sebastien Fabbro
  -- strict thread matches above, loose matches on Subject: below --
2015-12-03  9:55 Justin Lecher
2015-12-03  9:54 Justin Lecher
2013-05-23  5:13 Sebastien Fabbro
2012-04-23 18:43 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox