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 F1545138331 for ; Fri, 30 Sep 2016 04:20:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2A00E08A1; Fri, 30 Sep 2016 04:20:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C50F0E08A1 for ; Fri, 30 Sep 2016 04:20:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 757F1340817 for ; Fri, 30 Sep 2016 04:20:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 52AB42491 for ; Fri, 30 Sep 2016 04:20:16 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1475209179.b1738705ad4d4d1c4164807d15330e378e386fb5.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/lapack-reference/, sci-libs/lapack-reference/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/lapack-reference/Manifest sci-libs/lapack-reference/files/eselect.lapack.reference-r1 sci-libs/lapack-reference/files/lapack-fix-build-system.patch sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild sci-libs/lapack-reference/metadata.xml X-VCS-Directories: sci-libs/lapack-reference/ sci-libs/lapack-reference/files/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: b1738705ad4d4d1c4164807d15330e378e386fb5 X-VCS-Branch: master Date: Fri, 30 Sep 2016 04:20:16 +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: 002364c8-5abe-4f1f-9575-c2651a330f65 X-Archives-Hash: 0eeacd08bd4934b59aa2fa64fc9d7f08 commit: b1738705ad4d4d1c4164807d15330e378e386fb5 Author: Matthias Maier gentoo org> AuthorDate: Fri Sep 30 04:09:51 2016 +0000 Commit: Matthias Maier gentoo org> CommitDate: Fri Sep 30 04:19:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1738705 sci-libs/lapack-reference: version bump to 3.6.0 Package-Manager: portage-2.3.0 sci-libs/lapack-reference/Manifest | 1 + .../files/eselect.lapack.reference-r1 | 4 + .../files/lapack-fix-build-system.patch | 92 +++++++++++++++++++++ .../lapack-reference/lapack-reference-3.6.0.ebuild | 94 ++++++++++++++++++++++ sci-libs/lapack-reference/metadata.xml | 5 +- 5 files changed, 195 insertions(+), 1 deletion(-) diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest index 743ff40..a56b2e5 100644 --- a/sci-libs/lapack-reference/Manifest +++ b/sci-libs/lapack-reference/Manifest @@ -1,2 +1,3 @@ DIST lapack-3.2.1.tgz 4792502 SHA256 5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d SHA512 a89b88540f8e5b05b7c58e8e301a5068729ceb35fcb2143edfff1644458ff1a375e5185492cf116b50409fe0c17b51c253a2987f4df83e9f9c3968a4b77e5d97 WHIRLPOOL f5c4be0a4e595ea5276a4878ab6e3578bb621be72142b6bf6cb15fc45bd52558c89b04a7ee0d1558b4f0aa9d1cff9cad43667f2251762dc8ad6aa5e687536149 +DIST lapack-3.6.0.tgz 6792324 SHA256 a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233ffc3 SHA512 bc50441d415ef8896dd7626d77c6104184b996e758704366288089f03d4c99d068e33153b0d13305310886017e5d2e716130f812a95cfcad36ef37fe20417ab8 WHIRLPOOL 5576d0a81b2645fe95ef7011cc398f31142b8dcd01cdf5945e3db0e73ae1768766ea54254b40f4c6a581a6fb77b911595fccd597be0536833118af5877bb0c64 DIST lapack-reference-3.2.1-autotools.patch.bz2 13338 SHA256 de2ab4ea9723f549c77b38d932e5ddb55b7b5583b0050e527505210460dcdf76 SHA512 957e8c7646a0d6ade9c0dfdaf2aa665a01f932dfda376ba1db164106fb174793e6504cdbed7daf158f23bb69502937963cb2e2d45ac720980d3832f6fc0fedbd WHIRLPOOL 8872222a124cd8593c8441034b6fd47463193e03bdebafc8b2790ebc73f49eb811762dc9cd98949bda0af7869f9d12b9ebbfc23457b5393d88c00a013c4f419d diff --git a/sci-libs/lapack-reference/files/eselect.lapack.reference-r1 b/sci-libs/lapack-reference/files/eselect.lapack.reference-r1 new file mode 100644 index 00000000..b6c4db3 --- /dev/null +++ b/sci-libs/lapack-reference/files/eselect.lapack.reference-r1 @@ -0,0 +1,4 @@ +lapack/reference/liblapack.so /usr/@LIBDIR@/liblapack.so +lapack/reference/liblapack.so.3 /usr/@LIBDIR@/liblapack.so.3 +lapack/reference/liblapack.a /usr/@LIBDIR@/liblapack.a +../lapack/reference/lapack.pc /usr/@LIBDIR@/pkgconfig/lapack.pc 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 00000000..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 new file mode 100644 index 00000000..273bf10 --- /dev/null +++ b/sci-libs/lapack-reference/lapack-reference-3.6.0.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2016 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 + +DESCRIPTION="Reference implementation of LAPACK" +HOMEPAGE="http://www.netlib.org/lapack/" +SRC_URI="http://www.netlib.org/lapack/lapack-${PV}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos" +IUSE="+deprecated" + +DEPEND="app-eselect/eselect-lapack + >=virtual/blas-3.6 + virtual/pkgconfig" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/lapack-${PV}" +PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" ) + +src_prepare() { + epatch "${PATCHES[@]}" + + eapply_user + + ESELECT_PROF=reference + + # some string does not get passed properly + sed -i \ + -e '/lapack_testing.py/d' \ + CTestCustom.cmake.in || die + # separate ebuild to tmglib + sed -i \ + -e '/lapack_install_library(tmglib)/d' \ + TESTING/MATGEN/CMakeLists.txt || die + + cp "${FILESDIR}"/eselect.lapack.reference-r1 "${T}"/eselect.lapack.reference || die + sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.lapack.reference || die + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \ + "${T}"/eselect.lapack.reference || die + fi +} + +src_configure() { + local mycmakeargs=( + -Wno-dev + -DUSE_OPTIMIZED_BLAS=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + -DBUILD_DEPRECATED=$(usex deprecated) + -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}" + -DBUILD_STATIC_LIBS=ON + -DBUILD_SHARED_LIBS=ON + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + + mkdir -p "${ED}/usr/$(get_libdir)/lapack/reference" || die + mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/$(get_libdir)/pkgconfig"/* \ + "${ED}/usr/$(get_libdir)/lapack/reference" || die + rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die + rm -rf "${ED}"/usr/lib/ || die + + eselect lapack add $(get_libdir) "${T}"/eselect.lapack.reference ${ESELECT_PROF} +} + +pkg_postinst() { + local p=lapack + 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/lapack-reference/metadata.xml b/sci-libs/lapack-reference/metadata.xml index 6e15425..9bd49b1 100644 --- a/sci-libs/lapack-reference/metadata.xml +++ b/sci-libs/lapack-reference/metadata.xml @@ -12,5 +12,8 @@ linear sets of equations, eigenvector analysis, singular value decomposition, etc. It is a very comprehensive and reputable package that has found extensive use in the scientific community. This package installs the reference FORTRAN 77 implementation from Netlib. - + + + Build deprecated routines +