| 1 |
commit: 2c89f0b83f35b1aad6d3da4e704d4956ed78a1d1 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Aug 26 14:32:52 2021 +0000 |
| 4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
| 5 |
CommitDate: Thu Aug 26 14:32:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2c89f0b8 |
| 7 |
|
| 8 |
sys-cluster/sionlib: move sed to patch |
| 9 |
|
| 10 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 11 |
|
| 12 |
...respect-flags.patch => sionlib-respect-flags-v2.patch} | 15 ++++++++++++++- |
| 13 |
sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild | 8 +------- |
| 14 |
2 files changed, 15 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-cluster/sionlib/files/sionlib-respect-flags.patch b/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch |
| 17 |
similarity index 87% |
| 18 |
rename from sys-cluster/sionlib/files/sionlib-respect-flags.patch |
| 19 |
rename to sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch |
| 20 |
index a7ac351ea..6f21f3b95 100644 |
| 21 |
--- a/sys-cluster/sionlib/files/sionlib-respect-flags.patch |
| 22 |
+++ b/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch |
| 23 |
@@ -8,6 +8,19 @@ |
| 24 |
COMP= |
| 25 |
if [ -z "$CC" ]; then |
| 26 |
echo "No 'cc' located!" |
| 27 |
+--- a/config/determine-compiler-version.sh |
| 28 |
++++ b/config/determine-compiler-version.sh |
| 29 |
+@@ -24,8 +24,8 @@ |
| 30 |
+ | cut -d\ -f 1` |
| 31 |
+ COMPVER="${CVER}/${FVER}" |
| 32 |
+ ;; |
| 33 |
+- gnu) COMPVER=`gcc -dumpfullversion -dumpversion` |
| 34 |
+- #COMPVER=`gcc -v 2>&1 | grep -i 'Version [0-9]' \ |
| 35 |
++ gnu) COMPVER=`${CC} -dumpfullversion -dumpversion` |
| 36 |
++ #COMPVER=`${CC} -v 2>&1 | grep -i 'Version [0-9]' \ |
| 37 |
+ # | sed -e 's/^.*ersion \(.\..\..\).*$/\1/'` |
| 38 |
+ ;; |
| 39 |
+ *) ErrorAndExit "Unknown compiler '${COMP}'" |
| 40 |
--- a/config/select-compiler.sh |
| 41 |
+++ b/config/select-compiler.sh |
| 42 |
@@ -9,7 +9,7 @@ |
| 43 |
@@ -93,7 +106,7 @@ |
| 44 |
|
| 45 |
--- a/src/fortraninterface/Makefile |
| 46 |
+++ b/src/fortraninterface/Makefile |
| 47 |
-@@ -121,21 +122,21 @@ |
| 48 |
+@@ -121,21 +121,21 @@ |
| 49 |
$(CPP) $(F90FLAGS) $(F90FLAGS_CPP) $(F90MPIFLAGS) -P -E -I ../lib sion_f90_mpi.F90 > sion_f90_mpi.f90 |
| 50 |
sion_f90_mpi.mod : sion_f90_mpi.o |
| 51 |
sion_f90_mpi.o : sion_f90_mpi.f90 sion_f90.mod $(SION_HDRS) |
| 52 |
|
| 53 |
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild |
| 54 |
index ba466e09b..d9fdfc7af 100644 |
| 55 |
--- a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild |
| 56 |
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild |
| 57 |
@@ -21,7 +21,7 @@ KEYWORDS="~amd64" |
| 58 |
IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi +openmp +parutils +pthreads python sionfwd" #cuda |
| 59 |
|
| 60 |
REQUIRED_USE="?? ( hostname-regex deep-est-sdv )" |
| 61 |
-PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" ) |
| 62 |
+PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" ) |
| 63 |
|
| 64 |
RDEPEND=" |
| 65 |
mpi? ( virtual/mpi ) |
| 66 |
@@ -45,12 +45,6 @@ pkg_setup() { |
| 67 |
fortran-2_pkg_setup |
| 68 |
} |
| 69 |
|
| 70 |
-src_prepare() { |
| 71 |
- default |
| 72 |
- sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || die |
| 73 |
- sed 's/`gcc/`${CC}/' -i config/determine-compiler-version.sh || die |
| 74 |
-} |
| 75 |
- |
| 76 |
src_configure() { |
| 77 |
tc-export AR CC CXX F77 FC |
| 78 |
export MPICC=/usr/bin/mpicc |
Archives