* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/files/, sys-cluster/sionlib/
@ 2021-08-26 14:37 Alessandro Barbieri
0 siblings, 0 replies; 2+ messages in thread
From: Alessandro Barbieri @ 2021-08-26 14:37 UTC (permalink / raw
To: gentoo-commits
commit: 2c89f0b83f35b1aad6d3da4e704d4956ed78a1d1
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Aug 26 14:32:52 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu Aug 26 14:32:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2c89f0b8
sys-cluster/sionlib: move sed to patch
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
...respect-flags.patch => sionlib-respect-flags-v2.patch} | 15 ++++++++++++++-
sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild | 8 +-------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/sionlib/files/sionlib-respect-flags.patch b/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
similarity index 87%
rename from sys-cluster/sionlib/files/sionlib-respect-flags.patch
rename to sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
index a7ac351ea..6f21f3b95 100644
--- a/sys-cluster/sionlib/files/sionlib-respect-flags.patch
+++ b/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
@@ -8,6 +8,19 @@
COMP=
if [ -z "$CC" ]; then
echo "No 'cc' located!"
+--- a/config/determine-compiler-version.sh
++++ b/config/determine-compiler-version.sh
+@@ -24,8 +24,8 @@
+ | cut -d\ -f 1`
+ COMPVER="${CVER}/${FVER}"
+ ;;
+- gnu) COMPVER=`gcc -dumpfullversion -dumpversion`
+- #COMPVER=`gcc -v 2>&1 | grep -i 'Version [0-9]' \
++ gnu) COMPVER=`${CC} -dumpfullversion -dumpversion`
++ #COMPVER=`${CC} -v 2>&1 | grep -i 'Version [0-9]' \
+ # | sed -e 's/^.*ersion \(.\..\..\).*$/\1/'`
+ ;;
+ *) ErrorAndExit "Unknown compiler '${COMP}'"
--- a/config/select-compiler.sh
+++ b/config/select-compiler.sh
@@ -9,7 +9,7 @@
@@ -93,7 +106,7 @@
--- a/src/fortraninterface/Makefile
+++ b/src/fortraninterface/Makefile
-@@ -121,21 +122,21 @@
+@@ -121,21 +121,21 @@
$(CPP) $(F90FLAGS) $(F90FLAGS_CPP) $(F90MPIFLAGS) -P -E -I ../lib sion_f90_mpi.F90 > sion_f90_mpi.f90
sion_f90_mpi.mod : sion_f90_mpi.o
sion_f90_mpi.o : sion_f90_mpi.f90 sion_f90.mod $(SION_HDRS)
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
index ba466e09b..d9fdfc7af 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi +openmp +parutils +pthreads python sionfwd" #cuda
REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
-PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
+PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" )
RDEPEND="
mpi? ( virtual/mpi )
@@ -45,12 +45,6 @@ pkg_setup() {
fortran-2_pkg_setup
}
-src_prepare() {
- default
- sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || die
- sed 's/`gcc/`${CC}/' -i config/determine-compiler-version.sh || die
-}
-
src_configure() {
tc-export AR CC CXX F77 FC
export MPICC=/usr/bin/mpicc
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/files/, sys-cluster/sionlib/
@ 2021-08-29 0:33 Alessandro Barbieri
0 siblings, 0 replies; 2+ messages in thread
From: Alessandro Barbieri @ 2021-08-29 0:33 UTC (permalink / raw
To: gentoo-commits
commit: 38318b70aa7ad75ce67aa155e86b1c5cf01a7aa0
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Fri Aug 27 00:55:28 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Aug 29 00:33:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=38318b70
sys-cluster/sionlib: respect flags
Closes: https://bugs.gentoo.org/804846
Closes: https://bugs.gentoo.org/804834
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
...ags-v2.patch => sionlib-respect-flags-v3.patch} | 52 ++++++++++++++++++++++
sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild | 2 +-
2 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch b/sys-cluster/sionlib/files/sionlib-respect-flags-v3.patch
similarity index 73%
rename from sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
rename to sys-cluster/sionlib/files/sionlib-respect-flags-v3.patch
index 6f21f3b95..7bf98ced1 100644
--- a/sys-cluster/sionlib/files/sionlib-respect-flags-v2.patch
+++ b/sys-cluster/sionlib/files/sionlib-respect-flags-v3.patch
@@ -104,6 +104,58 @@
SZLIB_LIBPATH = -L$(TOPDIR)/utils/szlib
SZLIB_LIB = -lsc.z
+--- a/mf/Makefile.defs.linux-gomp10
++++ b/mf/Makefile.defs.linux-gomp10
+@@ -23,24 +23,19 @@
+ #------------------------------------------------------------------------------
+ # SIONlib General Settings
+ #------------------------------------------------------------------------------
+-OPTFLAGS = -g -O0 -Wall
++CFLAGS += -std=c99 $(PFLAG) -fPIC
+
+-CC = gcc
+-CFLAGS = -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
++CXXFLAGS += $(PFLAG)
+
+-CXX = g++
+-CXXFLAGS = $(PFLAG) $(OPTFLAGS) -O3
+-
+-F77 = gfortran
+-FFLAGS = $(PFLAG) $(OPTFLAGS) -fallow-argument-mismatch
++FFLAGS += $(PFLAG) -fallow-argument-mismatch
+
+ F90 = $(F77)
+-F90FLAGS = $(PFLAG) $(OPTFLAGS) -ffree-form -fallow-argument-mismatch
++F90FLAGS += $(PFLAG) -ffree-form -fallow-argument-mismatch
+
+ FPP =
+ FDOPT = -D
+
+-LDFLAGS = $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
++LDFLAGS += $(PFLAG) $(HINTSLIB)
+ UTILLIB =
+ FOBASE = pomp_fwrapper_base.o
+
+@@ -101,10 +96,6 @@
+ #------------------------------------------------------------------------------
+
+ MPIENABLE = 1
+-MPICC = mpicc
+-MPICXX = mpicxx
+-MPIF77 = mpif77
+-MPIF90 = mpif90
+ MPILIB = -lmpich
+ PMPILIB = -lpmpich
+ #PMPILIB = # MPICH2
+@@ -139,7 +130,7 @@
+ #------------------------------------------------------------------------------
+
+ SZLIB = szlib
+-SZLIB_OPTFLAGS = -O3
++SZLIB_OPTFLAGS = $(CFLAGS)
+ SZLIB_CFLAGS = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED
+ SZLIB_LIBPATH = -L$(TOPDIR)/utils/szlib
+ SZLIB_LIB = -lsc.z
--- a/src/fortraninterface/Makefile
+++ b/src/fortraninterface/Makefile
@@ -121,21 +121,21 @@
diff --git a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
index d9fdfc7af..33e8dbdd8 100644
--- a/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64"
IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi +openmp +parutils +pthreads python sionfwd" #cuda
REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
-PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-respect-flags-v3.patch" )
RDEPEND="
mpi? ( virtual/mpi )
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-29 0:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-29 0:33 [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/sionlib/files/, sys-cluster/sionlib/ Alessandro Barbieri
-- strict thread matches above, loose matches on Subject: below --
2021-08-26 14:37 Alessandro Barbieri
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox