From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 132101384B4 for ; Thu, 3 Dec 2015 09:54:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77BAC21C068; Thu, 3 Dec 2015 09:54:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BAEF121C059 for ; Thu, 3 Dec 2015 09:54:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C30E34097F for ; Thu, 3 Dec 2015 09:54:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF4C9C7A for ; Thu, 3 Dec 2015 09:54:47 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1449135740.c0d4a0df972b6ae538d89f94dc59eea472a62a53.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/cblas-reference/files/, sci-libs/cblas-reference/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild sci-libs/cblas-reference/files/lapack-fix-build-system.patch X-VCS-Directories: sci-libs/cblas-reference/ sci-libs/cblas-reference/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: c0d4a0df972b6ae538d89f94dc59eea472a62a53 X-VCS-Branch: master Date: Thu, 3 Dec 2015 09:54:47 +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-Archives-Salt: 929a6fb2-3bce-4876-9947-8b0d1618f945 X-Archives-Hash: 4f268e2ea00effbc767081f911e4b091 commit: c0d4a0df972b6ae538d89f94dc59eea472a62a53 Author: Ted Tanberry gmail com> AuthorDate: Wed Dec 2 19:27:45 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Dec 3 09:42:20 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c0d4a0df sci-libs/cblas-reference: update pkg-config handling .../cblas-reference-20151113-r1.ebuild | 11 ++- .../files/lapack-fix-build-system.patch | 92 ++++++++++++++++++++++ 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild b/sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild index bd7f08d..f00d975 100644 --- a/sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild +++ b/sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 ) NUMERIC_MODULE_NAME="refcblas" -inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 toolchain-funcs +inherit alternatives-2 cmake-utils fortran-2 numeric-int64-multibuild python-any-r1 toolchain-funcs eutils LPN=lapack LPV=3.6.0 @@ -30,11 +30,16 @@ DEPEND="${RDEPEND} virtual/pkgconfig" S="${WORKDIR}/${LPN}-${LPV}" +PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" ) MULTILIB_WRAPPED_HEADERS=( /usr/include/cblas/cblas.h ) src_prepare() { + # 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 blas implementations # ${LIBNAME} and ${PROFNAME} are not defined here, they are in single # quotes in the following seds. They are later set by defining cmake @@ -49,8 +54,8 @@ src_prepare() { -e 's:/CMAKE/:/cmake/:g' \ CBLAS/CMakeLists.txt || die sed -i \ - -e '/Name: /s:cblas:${PROFNAME}:' \ - -e 's:-lcblas:-l${LIBNAME}:g' \ + -e '/Name: /s:cblas:@PROFNAME@:' \ + -e 's:-lcblas:-l@LIBNAME@:g' \ CBLAS/cblas.pc.in || die sed -i \ -e 's:cblas):${LIBNAME}):' \ diff --git a/sci-libs/cblas-reference/files/lapack-fix-build-system.patch b/sci-libs/cblas-reference/files/lapack-fix-build-system.patch new file mode 100644 index 0000000..8661709 --- /dev/null +++ b/sci-libs/cblas-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