* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pastix/files/, sci-libs/pastix/
@ 2024-07-31 9:24 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2024-07-31 9:24 UTC (permalink / raw
To: gentoo-commits
commit: 1e34d12ef2f2712ea85969bbb6b6908b9a9c8886
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 07:44:31 2024 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 09:23:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e34d12e
sci-libs/pastix: drop 5.2.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
sci-libs/pastix/Manifest | 1 -
sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch | 139 -----------------------
sci-libs/pastix/pastix-5.2.3.ebuild | 118 -------------------
3 files changed, 258 deletions(-)
diff --git a/sci-libs/pastix/Manifest b/sci-libs/pastix/Manifest
index 67a373f23211..2d332d8ba962 100644
--- a/sci-libs/pastix/Manifest
+++ b/sci-libs/pastix/Manifest
@@ -1,2 +1 @@
DIST pastix-6.0.3.tar.gz 1793579 BLAKE2B 9e0ee71c80b2c93c6762c1a824b2e1262fd1a9f406194fb99eeecbfc172cf82f497d23a541b56c44e5487c3c228cab781f47f683ee04c6cdf426da6126750a69 SHA512 5bf8dfa6ed02ee7e236c63e21c80bd45af807b465b21a8c0520b1328e179095f1416f925be9f8b5ec0e8078ca9bc4398bf0d091fdc8e9ea51b9af12a06d9a544
-DIST pastix_5.2.3.tar.bz2 2246903 BLAKE2B b13cb31bbc2aeb122e932b2a934598ec975a55f327483bf1383280976584858426c56982f6980b52f32f04e05c6e6c8de1cf35e378e61a7be9dddb705b1c033a SHA512 69acffac1be8c756886783c2a6307269ab4d14abfc4a77268b3d14995e53b16084c298446812484233d9d52c317490d6ad67788166adf367075e6c8442147b95
diff --git a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch b/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
deleted file mode 100644
index d86ec5b78416..000000000000
--- a/sci-libs/pastix/files/pastix-5.2.3-MPI-3.0.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-https://bugs.gentoo.org/692742
-rename MPI 1.0 to 3.0+ functions:
-- MPI_Address -> MPI_Get_address
-- MPI_Type_struct -> MPI_Type_create_struct
-
---- a/common/src/nompi.h
-+++ b/common/src/nompi.h
-@@ -127,9 +127,9 @@
- #define MPI_Start(request)
- #define MPI_Startall(count, array_of_requests)
- #define MPI_Type_contiguous(count, oldtype, newtype)
--#define MPI_Type_struct(count, array_of_blocklengths, array_of_displacement, \
-+#define MPI_Type_create_struct(count, array_of_blocklengths, array_of_displacement, \
- oldtype, newtype)
--#define MPI_Address(location, newtype)
-+#define MPI_Get_address(location, newtype)
- #define MPI_Type_commit(datatype)
- #define MPI_Type_free(datatype)
- #define MPI_Request_free(request)
---- a/sopalin/src/sopalin_sendrecv.c
-+++ b/sopalin/src/sopalin_sendrecv.c
-@@ -1300,10 +1300,10 @@
- thread_data->gtaboffs[packnbr] = FANIN_INFOTAB(t);
- thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t);
- #else /* NO_MPI_TYPE */
-- CALL_MPI MPI_Address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr]));
-- TEST_MPI("MPI_Address");
-- CALL_MPI MPI_Address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1]));
-- TEST_MPI("MPI_Address");
-+ CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),&(thread_data->gtaboffs[packnbr]));
-+ TEST_MPI("MPI_Get_address");
-+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),&(thread_data->gtaboffs[packnbr+1]));
-+ TEST_MPI("MPI_Get_address");
- #endif /* NO_MPI_TYPE */
-
- /* Add other contribution for the same task */
-@@ -1410,12 +1410,12 @@
- thread_data->gtaboffs[packnbr] = FANIN_INFOTAB(t);
- thread_data->gtaboffs[packnbr+1] = FANIN_COEFTAB(t);
- #else /* NO_MPI_TYPE */
-- CALL_MPI MPI_Address(FANIN_INFOTAB(t),
-+ CALL_MPI MPI_Get_address(FANIN_INFOTAB(t),
- &(thread_data->gtaboffs[packnbr]));
-- TEST_MPI("MPI_Address");
-- CALL_MPI MPI_Address(FANIN_COEFTAB(t),
-+ TEST_MPI("MPI_Get_address");
-+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(t),
- &(thread_data->gtaboffs[packnbr+1]));
-- TEST_MPI("MPI_Address");
-+ TEST_MPI("MPI_Get_address");
- #endif /* NO_MPI_TYPE */
-
- if (queueSize(sendqueue))
-@@ -1508,10 +1508,10 @@
- TEST_MPI("MPI_Rsend");
- # endif
- #else /* NO_MPI_TYPE */
-- CALL_MPI MPI_Type_struct(2*(packnbr/2+1), thread_data->gtabsize,
-+ CALL_MPI MPI_Type_create_struct(2*(packnbr/2+1), thread_data->gtabsize,
- thread_data->gtaboffs,
- thread_data->gtabtype, &newtype);
-- TEST_MPI("MPI_Type_struct");
-+ TEST_MPI("MPI_Type_create_struct");
- CALL_MPI MPI_Type_commit(&newtype);
- TEST_MPI("MPI_Type_commit");
- # ifdef TEST_ISEND
-@@ -1602,15 +1602,15 @@
- (long)me, (unsigned int)(intptr_t)BTAG_COEFTAB(t));
-
- #ifndef NO_MPI_TYPE
-- CALL_MPI MPI_Address(BTAG_BTAGTAB(t),&(taboffs[0]));
-- TEST_MPI("MPI_Address");
-- CALL_MPI MPI_Address(BTAG_BCOFTAB(t),&(taboffs[1]));
-- TEST_MPI("MPI_Address");
-- CALL_MPI MPI_Address((void *)BTAG_COEFTAB(t),&(taboffs[2]));
-- TEST_MPI("MPI_Address");
-+ CALL_MPI MPI_Get_address(BTAG_BTAGTAB(t),&(taboffs[0]));
-+ TEST_MPI("MPI_Get_address");
-+ CALL_MPI MPI_Get_address(BTAG_BCOFTAB(t),&(taboffs[1]));
-+ TEST_MPI("MPI_Get_address");
-+ CALL_MPI MPI_Get_address((void *)BTAG_COEFTAB(t),&(taboffs[2]));
-+ TEST_MPI("MPI_Get_address");
-
-- CALL_MPI MPI_Type_struct(3,tabsize,taboffs,tabtype,&newtype);
-- TEST_MPI("MPI_Type_struct");
-+ CALL_MPI MPI_Type_create_struct(3,tabsize,taboffs,tabtype,&newtype);
-+ TEST_MPI("MPI_Type_create_struct");
-
- CALL_MPI MPI_Type_commit(&newtype);
- TEST_MPI("MPI_Type_commit");
---- a/sopalin/src/updo_sendrecv.c
-+++ b/sopalin/src/updo_sendrecv.c
-@@ -347,12 +347,12 @@
- tabtype[0] = COMM_INT;
- tabtype[1] = COMM_FLOAT;
-
-- CALL_MPI MPI_Address(infotab,&(taboffs[0]));
-- TEST_MPI("MPI_Address");
-- CALL_MPI MPI_Address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1]));
-- TEST_MPI("MPI_Address");
-- CALL_MPI MPI_Type_struct(2,tabsize,taboffs,tabtype,&newtype);
-- TEST_MPI("MPI_Type_struct");
-+ CALL_MPI MPI_Get_address(infotab,&(taboffs[0]));
-+ TEST_MPI("MPI_Get_address");
-+ CALL_MPI MPI_Get_address(FANIN_COEFTAB(SOLV_FTGTIND(j)),&(taboffs[1]));
-+ TEST_MPI("MPI_Get_address");
-+ CALL_MPI MPI_Type_create_struct(2,tabsize,taboffs,tabtype,&newtype);
-+ TEST_MPI("MPI_Type_create_struct");
- CALL_MPI MPI_Type_commit(&newtype);
- TEST_MPI("MPI_Type_commit");
- # endif /* NO_MPI_TYPE */
-@@ -974,8 +974,8 @@
-
- tabtype[0] = COMM_INT;
-
-- CALL_MPI MPI_Address(infotab,&(taboffs[0]));
-- TEST_MPI("MPI_Address");
-+ CALL_MPI MPI_Get_address(infotab,&(taboffs[0]));
-+ TEST_MPI("MPI_Get_address");
-
- /* If schur, send empty data */
- if ((sopalin_data->sopar->iparm[IPARM_SCHUR] == API_YES &&
-@@ -988,12 +988,12 @@
- for (iter=1; iter<UPDOWN_SM2XNBR+1; iter++) {
- tabsize[iter] = size;
- tabtype[iter] = COMM_FLOAT;
-- CALL_MPI MPI_Address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter]));
-- TEST_MPI("MPI_Address");
-+ CALL_MPI MPI_Get_address(gb+((iter-1)*UPDOWN_SM2XSZE),&(taboffs[iter]));
-+ TEST_MPI("MPI_Get_address");
- }
- }
-- CALL_MPI MPI_Type_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype);
-- TEST_MPI("MPI_Type_struct");
-+ CALL_MPI MPI_Type_create_struct(UPDOWN_SM2XNBR+1,tabsize,taboffs,tabtype,&newtype);
-+ TEST_MPI("MPI_Type_create_struct");
- CALL_MPI MPI_Type_commit(&newtype);
- TEST_MPI("MPI_Type_commit");
-
diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild
deleted file mode 100644
index 4b0bafedefaf..000000000000
--- a/sci-libs/pastix/pastix-5.2.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fortran-2 toolchain-funcs
-
-# TODO:
-# testing: emake examples?
-# better doc instalation and building
-# pypastix (separate package?)
-# multilib with eselect?
-# static libs building without pic
-# metis?
-
-# package id: change every version, see the link on inriaforge
-PID=218
-DESCRIPTION="Parallel solver for very large sparse linear systems"
-HOMEPAGE="https://solverstack.gitlabpages.inria.fr/pastix/ https://gitlab.inria.fr/solverstack/pastix"
-SRC_URI="https://gforge.inria.fr/frs/download.php/latestfile/${PID}/${PN}_${PV}.tar.bz2"
-S="${WORKDIR}/${PN}_${PV}/src"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi +smp starpu static-libs"
-
-RDEPEND="
- sci-libs/scotch:0=[int64?,mpi?]
- sys-apps/hwloc:0=
- virtual/blas
- mpi? ( virtual/mpi )
- starpu? ( dev-libs/starpu:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-MPI-3.0.patch )
-
-src_prepare() {
- default
- sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
- -e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
- -e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
- -e "s:^\(CF90PROG\s*=\).*:\1 $(tc-getFC):" \
- -e "s:^\(ARPROG\s*=\).*:\1 $(tc-getAR):" \
- -e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \
- -e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \
- -e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \
- -e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \
- -e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \
- -e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \
- -e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \
- -e 's:^#\s*\(SHARED\s*=\).*:\1 1:' \
- -e 's:^#\s*\(SOEXT\s*=\).*:\1 .so:' \
- -e '/fPIC/s/^#//g' \
- -e "s:^#\s*\(SHARED_FLAGS\s*=.*\):\1 ${LDFLAGS}:" \
- -e "s:pkg-config:$(tc-getPKG_CONFIG):g" \
- -e "s:^\(BLASLIB\s*=\).*:\1 $($(tc-getPKG_CONFIG) --libs blas):" \
- -e "s:^\s*\(HWLOC_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
- -e "s:-I\$(HWLOC_INC):$($(tc-getPKG_CONFIG) --cflags hwloc):" \
- -e "s:-L\$(HWLOC_LIB) -lhwloc:$($(tc-getPKG_CONFIG) --libs hwloc):" \
- -e "s:^\s*\(SCOTCH_HOME\s*?=\).*:\1 ${EPREFIX}/usr:" \
- -e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \
- -e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \
- config/LINUX-GNU.in > config.in || die
- sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die
-}
-
-src_configure() {
- if use amd64; then
- sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \
- -i config.in || die
- fi
-
- if use int64; then
- sed -e '/VERSIONINT.*_int64/s/#//' \
- -e '/CCTYPES.*INTSSIZE64/s/#//' \
- -i config.in || die
- fi
-
- if ! use mpi; then
- sed -e '/VERSIONMPI.*_nompi/s/#//' \
- -e '/CCTYPES.*NOMPI/s/#//' \
- -e '/MPCCPROG\s*= $(CCPROG)/s/#//' \
- -e '/MCFPROG\s*= $(CFPROG)/s/#//' \
- -e 's/-DDISTRIBUTED//' \
- -e 's/-lptscotch/-lscotch/g' \
- -i config.in || die
- fi
-
- if ! use smp; then
- sed -e '/VERSIONSMP.*_nosmp/s/#//' \
- -e '/CCTYPES.*NOSMP/s/#//' \
- -i config.in || die
- fi
-
- if use starpu; then
- sed -e '/libstarpu/s/#//g' -i config.in || die
- fi
-}
-
-src_compile() {
- emake all drivers
-}
-
-src_test() {
- # both test and tests targets are defined and do not work
- emake examples
- echo
-}
-
-src_install() {
- default
- sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die
- # quick and dirty (static libs should really be built without pic)
- cd .. || die
- dodoc README.txt doc/refcard/refcard.pdf
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pastix/files/, sci-libs/pastix/
@ 2016-05-05 19:06 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-05-05 19:06 UTC (permalink / raw
To: gentoo-commits
commit: c3c7b1fd5e5c3f2925ad71c73bd5ae12eb2e5956
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 19:06:06 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 5 19:06:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c7b1fd
sci-libs/pastix: Add cast to double for C99 isnan macro
Gentoo-Bug: 580422
* Move patches into PATCHES bash array
Package-Manager: portage-2.2.28
...pastix-5.2.2.22-isnan-floating-point-cast.patch | 47 ++++++++++++++++++++++
sci-libs/pastix/pastix-5.2.2.22-r1.ebuild | 5 ++-
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch b/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch
new file mode 100644
index 0000000..8aa7c06
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-5.2.2.22-isnan-floating-point-cast.patch
@@ -0,0 +1,47 @@
+Add missing cast to floating-point type:
+* sopalin/src/variable_csc.c: In function ‘vcsc_add_node’:
+* sopalin/src/variable_csc.c:138:13: error: non-floating-point argument in call to function ‘__builtin_isnan’
+* if (isnan(vcsc->values[COL-1][i*dof2 + ii])) {
+See also:
+https://bugs.gentoo.org/show_bug.cgi?id=580422
+
+--- src/common/src/errors.h
++++ src/common/src/errors.h
+@@ -140,7 +140,7 @@
+ * expr - The value to check.
+ */
+ #define CHECK_NAN(expr) { \
+- ASSERT_DEBUG(!isnan(expr), DBG_SOPALIN_NAN); \
++ ASSERT_DEBUG(!isnan(((double) expr)), DBG_SOPALIN_NAN); \
+ ASSERT_DEBUG(!isinf(expr), DBG_SOPALIN_INF); \
+ }
+ #else
+--- src/sopalin/src/variable_csc.c
++++ src/sopalin/src/variable_csc.c
+@@ -135,7 +135,7 @@
+ #endif
+
+ for (ii = 0; ii < dof2; ii++) {
+- if (isnan(vcsc->values[COL-1][i*dof2 + ii])) {
++ if (isnan(((double) vcsc->values[COL-1][i*dof2 + ii]))) {
+ vcsc->values[COL-1][i*dof2 + ii] = VALUE[ii];
+ } else {
+ vcsc->values[COL-1][i*dof2 + ii] = op(vcsc->values[COL-1][i*dof2 + ii],
+@@ -252,7 +252,7 @@
+ vcsc->rows[COL_NODE][i]);
+ }
+ #endif
+- if (isnan(vcsc->values[COL_NODE][idx])) {
++ if (isnan(((double) vcsc->values[COL_NODE][idx]))) {
+ vcsc->values[COL_NODE][idx] = VALUE;
+ } else {
+ vcsc->values[COL_NODE][idx] = op(vcsc->values[COL_NODE][idx],
+@@ -660,7 +660,7 @@
+ } else {
+ INTS iterdof;
+ for (iterdof = 0; iterdof < dof2; iterdof++) {
+- if (!isnan(vcsc->values[MYCOL-1][dof2*iter2+iterdof])) {
++ if (!isnan(((double) vcsc->values[MYCOL-1][dof2*iter2+iterdof]))) {
+ /* ignore NaN values from VCSC */
+ (*values_o)[dof2*iter3+iterdof] = op(
+ (*values_o)[dof2*iter3+iterdof],
diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
index de59c9a..0fff267 100644
--- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
+++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -41,11 +41,14 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/${P}-nosmp-undefined-variable.patch"
+ "${FILESDIR}/${P}-isnan-floating-point-cast.patch"
+)
S="${WORKDIR}/${PN}_${PV}/src"
src_prepare() {
default
- epatch "${FILESDIR}"/${P}-nosmp-undefined-variable.patch
sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
-e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
-e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-libs/pastix/files/, sci-libs/pastix/
@ 2016-02-23 16:48 Sebastien Fabbro
0 siblings, 0 replies; 3+ messages in thread
From: Sebastien Fabbro @ 2016-02-23 16:48 UTC (permalink / raw
To: gentoo-commits
commit: f2fb1a2fcf3dba3c60979819a04caa4b91a3eeab
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 17:44:05 2016 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 17:44:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2fb1a2f
sci-libs/pastix: re-add smp flag with patch and set it as default
Package-Manager: portage-2.2.27
.../pastix-5.2.2.22-nosmp-undefined-variable.patch | 15 ++++++
...x-5.2.2.22.ebuild => pastix-5.2.2.22-r1.ebuild} | 56 ++++++++++++----------
2 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch b/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
new file mode 100644
index 0000000..c01b02b
--- /dev/null
+++ b/sci-libs/pastix/files/pastix-5.2.2.22-nosmp-undefined-variable.patch
@@ -0,0 +1,15 @@
+--- ./sopalin/src/updo.c.orig 2016-02-23 01:42:00.000000000 +0000
++++ ./sopalin/src/updo.c 2016-02-23 01:42:10.000000000 +0000
+@@ -940,8 +940,10 @@
+ i = TASK_CBLKNUM(i);
+ # define END_LOOP(a) } SMP_END_LOOP(a)
+ # else /* SMP_SOPALIN */
+-# define START_LOOP for (i=0;i<SYMB_CBLKNBR;i++)
+-# define END_LOOP
++# define START_LOOP \
++ int bubnum = me; \
++ for (i=0;i<SYMB_CBLKNBR;i++)
++# define END_LOOP(a) a
+ # endif
+
+ /* Xi=(Dii)-1Xi; */
diff --git a/sci-libs/pastix/pastix-5.2.2.22.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
similarity index 76%
rename from sci-libs/pastix/pastix-5.2.2.22.ebuild
rename to sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
index 19e3f24..de59c9a 100644
--- a/sci-libs/pastix/pastix-5.2.2.22.ebuild
+++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-inherit eutils fortran-2 toolchain-funcs multilib
+inherit fortran-2 toolchain-funcs
# TODO:
# testing: emake examples?
@@ -14,13 +14,14 @@ inherit eutils fortran-2 toolchain-funcs multilib
# static libs building without pic
# metis?
-# commit id: change every version
-CID=
# package id: change every version, see the link on inriaforge
PID=35070
+# commit id: change every version
+#CID=351ef60
# leave empty if this is not a post release bug fix
-PPV=bugfix10_
-MYPN=pastix_release
+#PPV=bugfix9_
+#MYPN=pastix_release
+#SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${MYPN}_${PPV}${CID}.tar.bz2"
DESCRIPTION="Parallel solver for very large sparse linear systems"
HOMEPAGE="http://pastix.gforge.inria.fr"
@@ -29,8 +30,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${PN}_${PV}.tar.bz2"
LICENSE="CeCILL-C"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-#IUSE="doc int64 mpi smp starpu static-libs"
-IUSE="doc int64 mpi starpu static-libs"
+IUSE="doc int64 mpi +smp starpu static-libs"
RDEPEND="
sci-libs/scotch:0=[int64?,mpi?]
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}_${PV}/src"
src_prepare() {
+ default
+ epatch "${FILESDIR}"/${P}-nosmp-undefined-variable.patch
sed -e 's/^\(HOSTARCH\s*=\).*/\1 ${HOST}/' \
-e "s:^\(CCPROG\s*=\).*:\1 $(tc-getCC):" \
-e "s:^\(CFPROG\s*=\).*:\1 $(tc-getFC):" \
@@ -72,42 +74,39 @@ src_prepare() {
-e "s:^\s*\(SCOTCH_INC\s*?=.*\):\1/scotch:" \
-e "s:^\s*\(SCOTCH_LIB\s*?=.*\)lib:\1$(get_libdir):" \
config/LINUX-GNU.in > config.in || die
- sed -i -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' Makefile || die
- default
+ sed -e 's/__SO_NAME__,$@/__SO_NAME__,$(notdir $@)/g' -i Makefile || die
}
src_configure() {
if use amd64; then
- sed -i \
- -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' config.in || die
+ sed -e 's/^\(VERSIONBIT\s*=\).*/\1 _64bit/' \
+ -i config.in || die
fi
if use int64; then
- sed -i \
- -e '/VERSIONINT.*_int64/s/#//' \
- -e '/CCTYPES.*INTSSIZE64/s/#//' config.in || die
+ sed -e '/VERSIONINT.*_int64/s/#//' \
+ -e '/CCTYPES.*INTSSIZE64/s/#//' \
+ -i config.in || die
fi
if ! use mpi; then
- sed -i \
- -e '/VERSIONMPI.*_nompi/s/#//' \
+ sed -e '/VERSIONMPI.*_nompi/s/#//' \
-e '/CCTYPES.*NOMPI/s/#//' \
-e '/MPCCPROG\s*= $(CCPROG)/s/#//' \
-e '/MCFPROG\s*= $(CFPROG)/s/#//' \
-e 's/-DDISTRIBUTED//' \
-e 's/-lptscotch/-lscotch/g' \
- config.in || die
+ -i config.in || die
fi
-# if ! use smp; then
-# sed \
-# -e '/VERSIONSMP.*_nosmp/s/#//' \
-# -e '/CCTYPES.*NOSMP/s/#//' \
-# -i config.in || die
-# fi
+ if ! use smp; then
+ sed -e '/VERSIONSMP.*_nosmp/s/#//' \
+ -e '/CCTYPES.*NOSMP/s/#//' \
+ -i config.in || die
+ fi
if use starpu; then
- sed -i -e '/libstarpu/s/#//g' config.in || die
+ sed -e '/libstarpu/s/#//g' -i config.in || die
fi
}
@@ -115,10 +114,15 @@ src_compile() {
emake all drivers
}
+src_test() {
+ # both test and tests targets are defined and do not work
+ echo
+}
+
src_install() {
default
- sed -i -e "s:${D}::g" "${ED}"/usr/bin/pastix-conf || die
+ sed -e "s:${D}::g" -i "${ED}"/usr/bin/pastix-conf || die
# quick and dirty (static libs should really be built without pic)
- cd .. || die
+ cd .. || die
dodoc README.txt doc/refcard/refcard.pdf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-31 9:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-31 9:24 [gentoo-commits] repo/gentoo:master commit in: sci-libs/pastix/files/, sci-libs/pastix/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2016-05-05 19:06 David Seifert
2016-02-23 16:48 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox