From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- sci-libs/scalapack/Manifest | 3 +- .../scalapack/files/scalapack-2.0.2-libdir.patch | 45 ++++++++++++++ sci-libs/scalapack/scalapack-2.0.2-r1.ebuild | 69 ++++++++++++++++++++++ sci-libs/scalapack/scalapack-2.0.2.ebuild | 65 -------------------- 4 files changed, 116 insertions(+), 66 deletions(-) create mode 100644 sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch create mode 100644 sci-libs/scalapack/scalapack-2.0.2-r1.ebuild delete mode 100644 sci-libs/scalapack/scalapack-2.0.2.ebuild (limited to 'sci-libs/scalapack') diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest index e8967bcb7b78..d93c4aa9e24a 100644 --- a/sci-libs/scalapack/Manifest +++ b/sci-libs/scalapack/Manifest @@ -1,3 +1,4 @@ +AUX scalapack-2.0.2-libdir.patch 2159 BLAKE2B e96c845a6e841b8a432268b76755d92158ef880cff11b8925c82651cb2fda736e60da94ea075b44eff9f7a0e00854ac81308d762523351b68b66a782e131aa3a SHA512 40fa841fe31c6665eab09065eed8f5aed8ed48a8e2211ee5fd9365c5c101a2d7167c9d084628ee5f5a26475599a210c4011ce4a207c8df677cf72a67b6a26cac DIST scalapack-2.0.2.tgz 4779534 BLAKE2B c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b SHA512 92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248 -EBUILD scalapack-2.0.2.ebuild 1540 BLAKE2B 242720d4449a61a52f3507d3e252c6201806d970c625dab93afa7bd3a86137b9c835e49277237db428159398621080ba77735df6f884ce2dbebee0f23d84d935 SHA512 653d3002b4a16ddc5e8b9de2b6b7918e8a7380f5366d7bcd7506ce9c2fc3feb9547c2b9a6af4b85711c46d378282af29435fad60b43f5fa61914786bfbc7bbac +EBUILD scalapack-2.0.2-r1.ebuild 1586 BLAKE2B 028aef875fb1a867d43a0f07297352786aeca0292765bdf6aa3292022277e470ba5e426dc33c45c100a0fcef339c26835763a00bdfa5f0617505c0b67fd5cc3f SHA512 e39ccd1cd62ad9ff94d1eee1358fb49fe5b2da4fdf0e18e224f5d44344b5b01b31019e53eba1f82a8b728ad059e4f25a1e7d347ceea94d3d8c22068e5cd17491 MISC metadata.xml 662 BLAKE2B aacea4e0ad09d68f6d953ba2eeac01ffe9660d389271be5335686b2f2d1000ddc79e0a7f24e506749d57f5e6adc3c7f1f82f3d758fe1d62145dea29d5dcc05f4 SHA512 90820c7f860bfabd8b057277a967bffac6af9d12c334a5813ea4fc75cbdf90d63e5e8d8ec04d5c28e819785dafbbe698ca8e5933f97102c1369727a8a9eaa5b0 diff --git a/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch new file mode 100644 index 000000000000..a1604a8fd856 --- /dev/null +++ b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch @@ -0,0 +1,45 @@ +--- a/CMakeLists.txt 2012-05-02 05:58:24.000000000 +0200 ++++ b/CMakeLists.txt 2018-10-15 23:57:22.716171671 +0200 +@@ -101,8 +101,8 @@ + # Organize output files. On Windows this also keeps .dll files next + # to the .exe files that need them, making tests easy to run. + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING) +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib) +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib) ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}) + + # -------------------------------------------------- + # Check for any necessary platform specific compiler flags +@@ -163,8 +163,8 @@ + PREFIX ${SCALAPACK_BINARY_DIR}/dependencies + ) + if (UNIX) +- SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.a CACHE STRING "LAPACK library" FORCE) +- SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.a CACHE STRING "BLAS library" FORCE) ++ SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/liblapack.a CACHE STRING "LAPACK library" FORCE) ++ SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/libblas.a CACHE STRING "BLAS library" FORCE) + else (UNIX) # On Windows + SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.lib CACHE STRING "LAPACK library" FORCE) + SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.lib CACHE STRING "BLAS library" FORCE) +@@ -283,7 +283,7 @@ + if( NOT LAPACK_FOUND ) + install(FILES + ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} +- DESTINATION lib ++ DESTINATION lib${LIB_SUFFIX} + ) + endif( NOT LAPACK_FOUND ) + +@@ -303,9 +303,9 @@ + install(FILES + ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake + ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake +- DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION} ++ DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION} + ) + + install(EXPORT scalapack-targets +- DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION}) ++ DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION}) + diff --git a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild new file mode 100644 index 000000000000..3e60e55da8f2 --- /dev/null +++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils fortran-2 + +DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing" +HOMEPAGE="https://www.netlib.org/scalapack/" +SRC_URI="${HOMEPAGE}/${P}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs test" + +RDEPEND=" + virtual/lapack + virtual/mpi" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-libdir.patch" ) + +src_prepare() { + cmake-utils_src_prepare + + if use static-libs; then + mkdir "${WORKDIR}/${PN}_static" || die + fi + # mpi does not have a pc file + sed -i -e 's/mpi//' scalapack.pc.in || die +} + +src_configure() { + scalapack_configure() { + local mycmakeargs=( + -DUSE_OPTIMIZED_LAPACK_BLAS=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + -DBUILD_TESTING=$(usex test) + $@ + ) + cmake-utils_src_configure + } + + scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \ + -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON +} + +src_compile() { + cmake-utils_src_compile + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + use static-libs && \ + CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install + + insinto /usr/include/blacs + doins BLACS/SRC/*.h + + insinto /usr/include/scalapack + doins PBLAS/SRC/*.h +} diff --git a/sci-libs/scalapack/scalapack-2.0.2.ebuild b/sci-libs/scalapack/scalapack-2.0.2.ebuild deleted file mode 100644 index 68ade1f4a1ba..000000000000 --- a/sci-libs/scalapack/scalapack-2.0.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils eutils fortran-2 - -DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) computing" -HOMEPAGE="http://www.netlib.org/scalapack/" -SRC_URI="${HOMEPAGE}/${P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs test" - -RDEPEND=" - virtual/lapack - virtual/mpi" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - cmake-utils_src_prepare - - use static-libs && mkdir "${WORKDIR}/${PN}_static" - # mpi does not have a pc file - sed -i -e 's/mpi//' scalapack.pc.in || die -} - -src_configure() { - scalapack_configure() { - local mycmakeargs=( - -DUSE_OPTIMIZED_LAPACK_BLAS=ON - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" - $(cmake-utils_use_build test TESTING) - $@ - ) - cmake-utils_src_configure - } - - scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF - use static-libs && \ - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" scalapack_configure \ - -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -} - -src_compile() { - cmake-utils_src_compile - use static-libs && \ - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - use static-libs && \ - CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake-utils_src_install - - insinto /usr/include/blacs - doins BLACS/SRC/*.h - - insinto /usr/include/scalapack - doins PBLAS/SRC/*.h -} -- cgit v1.2.3