mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-19 20:13:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

sys-cluster/sionlibl: move sed to patch

Browse Source 
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2021-08-26 16:37:11 +02:00
parent 2c89f0b83f
commit 800e927101
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sys-cluster/sionlibl/files/sionlibl-respect-flags.patch → sys-cluster/sionlibl/files/sionlibl-respect-flags-v2.patch
View File

@@ -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)

8
sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild
View File

@@ -35,7 +35,7 @@ DEPEND="
"
REQUIRED_USE="?? ( hostname-regex deep-est-sdv )"
PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" )
PATCHES=( "${FILESDIR}/${PN}-respect-flags-v2.patch" )
pkg_setup() {
FORTRAN_NEED_OPENMP=0
@@ -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