[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2024-03-05 Thread Sam James
commit: 2df2ec23674da60b38a6aec7e5f1a8e5c281203b
Author: Eli Schwartz  gmail  com>
AuthorDate: Wed Mar  6 07:21:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  6 07:25:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df2ec23

sci-libs/scalapack: mark as LTO-unsafe, strict-aliasing unsafe

Closes: https://bugs.gentoo.org/862924
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 sci-libs/scalapack/scalapack-2.1.0.ebuild | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/sci-libs/scalapack/scalapack-2.1.0.ebuild 
b/sci-libs/scalapack/scalapack-2.1.0.ebuild
index e102c27d3b80..843d2ff0d166 100644
--- a/sci-libs/scalapack/scalapack-2.1.0.ebuild
+++ b/sci-libs/scalapack/scalapack-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake fortran-2 toolchain-funcs
+inherit cmake flag-o-matic fortran-2 toolchain-funcs
 
 GCC10_PATCH_HASH="bc6cad585362aa58e05186bb85d4b619080c45a9"
 
@@ -39,6 +39,14 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/862924
+   # https://github.com/Reference-ScaLAPACK/scalapack/issues/95
+   #
+   # Do not trust it for LTO either.
+   append-flags -fno-strict-aliasing
+   filter-lto
+
scalapack_configure() {
local mycmakeargs=(
-DUSE_OPTIMIZED_LAPACK_BLAS=ON



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2023-03-06 Thread Yixun Lan
commit: d2df62e1601955f90db882e358a9d89bc47ce3bb
Author: Yixun Lan  gentoo  org>
AuthorDate: Mon Mar  6 11:38:13 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Mar  7 00:14:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2df62e1

sci-libs/scalapack: Keyword 2.1.0 riscv, #881389

Signed-off-by: Yixun Lan  gentoo.org>

 sci-libs/scalapack/scalapack-2.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/scalapack/scalapack-2.1.0.ebuild 
b/sci-libs/scalapack/scalapack-2.1.0.ebuild
index d755a5b1ea9d..e102c27d3b80 100644
--- a/sci-libs/scalapack/scalapack-2.1.0.ebuild
+++ b/sci-libs/scalapack/scalapack-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2021-01-05 Thread Joonas Niilola
commit: aeaf7f406a8e46d1e4b8a9d037e2c5776a5d79c8
Author: Horea Christian  chymera  eu>
AuthorDate: Thu Oct 22 09:17:25 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan  5 08:32:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeaf7f40

sci-libs/scalapack: fixed GCC10 build issues

Closes: https://bugs.gentoo.org/727340
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Horea Christian  chymera.eu>
Closes: https://github.com/gentoo/gentoo/pull/18000
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-libs/scalapack/Manifest   |  1 +
 sci-libs/scalapack/scalapack-2.1.0.ebuild | 30 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index d30e37fd8aa..a0cbd514cbc 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1,2 +1,3 @@
 DIST scalapack-2.0.2.tgz 4779534 BLAKE2B 
c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b
 SHA512 
92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248
+DIST scalapack-2.1.0-gcc10.patch 231026 BLAKE2B 
dacecca8307cd2bf7a20e6453fb17bc1f5a3f2926b6d8f3b89f7f8d34993368574804f0427f228de4525f2b2d73105de561588ba5a4d2fb609d5ed035f51ddc9
 SHA512 
a11057599639c167e907f8e4d45204174fd326e2ffb9e2d05533db23d8e2dd8cfc1d37f06d5502baa3d5714092fbf4638cf4d9fea84ca9d4fb150e21cc57861e
 DIST scalapack-2.1.0.tgz 5307441 BLAKE2B 
4aea055fc3e437bce7108d1555e93c50109bcfe84354903fd711509eedbe686349fda4030e2fa70faf1a9e7e3255e46e48c32b96a2916af6812b8aebceb750c2
 SHA512 
0e77fb535ebcc28e2d97499ef4bd5161f76ca0ba4a3e308c26ce5071cfc4be4f3814262f3fb38f378ce0b5b31c0913432fea00a1e9e3f7717b853d1182bdf5b4

diff --git a/sci-libs/scalapack/scalapack-2.1.0.ebuild 
b/sci-libs/scalapack/scalapack-2.1.0.ebuild
index a1979a20ad6..d755a5b1ea9 100644
--- a/sci-libs/scalapack/scalapack-2.1.0.ebuild
+++ b/sci-libs/scalapack/scalapack-2.1.0.ebuild
@@ -1,13 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils fortran-2 toolchain-funcs
+inherit cmake fortran-2 toolchain-funcs
+
+GCC10_PATCH_HASH="bc6cad585362aa58e05186bb85d4b619080c45a9"
 
 DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) 
computing"
 HOMEPAGE="https://www.netlib.org/scalapack/;
-SRC_URI="https://www.netlib.org/scalapack/${P}.tgz;
+SRC_URI="
+   https://www.netlib.org/scalapack/${P}.tgz
+   
https://github.com/Reference-ScaLAPACK/scalapack/commit/${GCC10_PATCH_HASH}.patch
 -> ${P}-gcc10.patch
+   "
 
 LICENSE="BSD"
 SLOT="0"
@@ -15,17 +20,16 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
virtual/lapack
virtual/mpi"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
-PATCHES=(
-)
+PATCHES=( "${DISTDIR}/${P}-gcc10.patch" )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
if use static-libs; then
mkdir "${WORKDIR}/${PN}_static" || die
@@ -43,7 +47,7 @@ src_configure() {
-DBUILD_TESTING=$(usex test)
$@
)
-   cmake-utils_src_configure
+   cmake_src_configure
}
 
scalapack_configure -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
@@ -53,15 +57,15 @@ src_configure() {
 }
 
 src_compile() {
-   cmake-utils_src_compile
+   cmake_src_compile
use static-libs && \
-   CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" 
cmake-utils_src_compile
+   CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_compile
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
use static-libs && \
-   CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" 
cmake-utils_src_install
+   CMAKE_BUILD_DIR="${WORKDIR}/${PN}_static" cmake_src_install
 
insinto /usr/include/blacs
doins BLACS/SRC/*.h



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2020-04-29 Thread Matthias Maier
commit: 19089ede16991afb7044047e5848f21e0757d442
Author: Matthias Maier  gentoo  org>
AuthorDate: Thu Apr 30 04:48:04 2020 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Thu Apr 30 04:53:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19089ede

sci-libs/scalapack: version bump to 2.1.0

Closes: https://bugs.gentoo.org/511150
Closes: https://bugs.gentoo.org/675636
Closes: https://bugs.gentoo.org/684750
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier  gentoo.org>

 sci-libs/scalapack/Manifest   |  1 +
 sci-libs/scalapack/scalapack-2.1.0.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/sci-libs/scalapack/Manifest b/sci-libs/scalapack/Manifest
index 5a13f95440b..d30e37fd8aa 100644
--- a/sci-libs/scalapack/Manifest
+++ b/sci-libs/scalapack/Manifest
@@ -1 +1,2 @@
 DIST scalapack-2.0.2.tgz 4779534 BLAKE2B 
c2aabd87bc8f7c0d9af31bd8ad8c933703dcbba399658d15c1e5256da2350c1a0feac2ca4a205f697b1c48083df89cbcd64ba432da036081c0f33d5d2acddc9b
 SHA512 
92c71d3de0900955511c527ab3ca57ff69d6d9edc390e69f93ac3769d32ce83a714326bcb6218c8c74b8874be2fdc8aad5e42c912a12581e8d4ce8829ea39248
+DIST scalapack-2.1.0.tgz 5307441 BLAKE2B 
4aea055fc3e437bce7108d1555e93c50109bcfe84354903fd711509eedbe686349fda4030e2fa70faf1a9e7e3255e46e48c32b96a2916af6812b8aebceb750c2
 SHA512 
0e77fb535ebcc28e2d97499ef4bd5161f76ca0ba4a3e308c26ce5071cfc4be4f3814262f3fb38f378ce0b5b31c0913432fea00a1e9e3f7717b853d1182bdf5b4

diff --git a/sci-libs/scalapack/scalapack-2.1.0.ebuild 
b/sci-libs/scalapack/scalapack-2.1.0.ebuild
new file mode 100644
index 000..a1979a20ad6
--- /dev/null
+++ b/sci-libs/scalapack/scalapack-2.1.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils fortran-2 toolchain-funcs
+
+DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) 
computing"
+HOMEPAGE="https://www.netlib.org/scalapack/;
+SRC_URI="https://www.netlib.org/scalapack/${P}.tgz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   virtual/lapack
+   virtual/mpi"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PATCHES=(
+)
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2018-10-15 Thread Andreas Sturmlechner
commit: 6737e375d5517a12b7e4bac03445f5c5dfb21577
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 15 22:10:20 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 15 22:10:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6737e375

sci-libs/scalapack: Drop 2.0.2 (r0)

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sci-libs/scalapack/scalapack-2.0.2.ebuild | 67 ---
 1 file changed, 67 deletions(-)

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 6eca44f0363..000
--- a/sci-libs/scalapack/scalapack-2.0.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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="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"
-
-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)"
-   $(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
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2018-10-15 Thread Andreas Sturmlechner
commit: 635f41d0894b7aec8169ff00f7cdb015864a9008
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 15 21:34:13 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 15 22:07:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635f41d0

sci-libs/scalapack: https

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sci-libs/scalapack/scalapack-2.0.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/scalapack/scalapack-2.0.2.ebuild 
b/sci-libs/scalapack/scalapack-2.0.2.ebuild
index 68ade1f4a1b..63623ecfac8 100644
--- a/sci-libs/scalapack/scalapack-2.0.2.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit cmake-utils eutils fortran-2
 
 DESCRIPTION="Subset of LAPACK routines redesigned for heterogenous (MPI) 
computing"
-HOMEPAGE="http://www.netlib.org/scalapack/;
+HOMEPAGE="https://www.netlib.org/scalapack/;
 SRC_URI="${HOMEPAGE}/${P}.tgz"
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/files/, sci-libs/scalapack/

2018-10-15 Thread Andreas Sturmlechner
commit: 0fad5bca0107d7ef03ecde354bed71bc50bd7dc0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 15 22:06:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 15 22:07:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fad5bca

sci-libs/scalapack: Fix libdir install paths

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../scalapack/files/scalapack-2.0.2-libdir.patch   | 45 ++
 sci-libs/scalapack/scalapack-2.0.2-r1.ebuild   |  2 +
 2 files changed, 47 insertions(+)

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 000..a1604a8fd85
--- /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.0 +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
index f520036f536..3e60e55da8f 100644
--- a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
@@ -20,6 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-libdir.patch" )
+
 src_prepare() {
cmake-utils_src_prepare
 



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2018-10-15 Thread Andreas Sturmlechner
commit: 8d6ed30ecbb830f5c40be33b4968253756ec188e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 15 21:40:08 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 15 22:07:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6ed30e

sci-libs/scalapack: Missing || die

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sci-libs/scalapack/scalapack-2.0.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scalapack/scalapack-2.0.2.ebuild 
b/sci-libs/scalapack/scalapack-2.0.2.ebuild
index 63623ecfac8..6eca44f0363 100644
--- a/sci-libs/scalapack/scalapack-2.0.2.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2.ebuild
@@ -23,7 +23,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
cmake-utils_src_prepare
 
-   use static-libs && mkdir "${WORKDIR}/${PN}_static"
+   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
 }



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2018-10-15 Thread Andreas Sturmlechner
commit: 9572a71e446e8199dfcec3cd14f7138dc5da501e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 15 21:43:57 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Oct 15 22:07:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9572a71e

sci-libs/scalapack: EAPI-6 bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sci-libs/scalapack/scalapack-2.0.2-r1.ebuild | 67 
 1 file changed, 67 insertions(+)

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 000..f520036f536
--- /dev/null
+++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
@@ -0,0 +1,67 @@
+# 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"
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/scalapack/

2017-10-15 Thread David Seifert
commit: 0dcebb889da00bdb1f99446cc455fb7536465293
Author: David Seifert  gentoo  org>
AuthorDate: Mon Oct 16 03:06:32 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Oct 16 03:06:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dcebb88

sci-libs/scalapack: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sci-libs/scalapack/scalapack-2.0.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/scalapack/scalapack-2.0.2.ebuild 
b/sci-libs/scalapack/scalapack-2.0.2.ebuild
index fadcb6568bd..68ade1f4a1b 100644
--- a/sci-libs/scalapack/scalapack-2.0.2.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,6 +21,8 @@ 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