Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix checksum for GULP 6.1 #16423

Merged
merged 2 commits into from
Oct 18, 2022
Merged

fix checksum for GULP 6.1 #16423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c65bed3
fix checksum for GULP 6.1 (fixes #15984)
boegel Oct 17, 2022
a8843f5
fix patch for latest revision of source tarball of GULP 6.1
boegel Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions easybuild/easyconfigs/g/GULP/GULP-6.1-foss-2021b.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ patches = [
'GULP-6.1_fftw-blas-linking-gcc-11.patch',
]
checksums = [
'503dff253f4686c570adfd3ff75a657e29151b4255dec726daa50eda5a7ac3f4', # gulp-6.1.tgz
'156449c96a97ff24f6add83c10fd383f07c43c79420eebe3290387b65b34549b', # gulp-6.1_fftw-blas-linking-gcc-11.patch
{'gulp-6.1.tgz': '1b52fe2928ccf2cea5d2c3466162764d0de6b4d06e86fe292ab37859d6a0e6d6'},
{'GULP-6.1_fftw-blas-linking-gcc-11.patch': 'd32babd56e859a9378548981a00b876a88b66e392cb532d33193b6e3362f7940'},
]

download_instructions = """Download requires registration, please see
Expand Down
23 changes: 6 additions & 17 deletions easybuild/easyconfigs/g/GULP/GULP-6.1_fftw-blas-linking-gcc-11.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
Removing hard-coded paths in the mkgulp file, which is creating the makefile
Using the suggested compiler flags for gfortran-10
author: J. Sassmannshausen (Imperial College London/UK)
diff --git a/gulp-6.1.orig/Src/mkgulp b/gulp-6.1/Src/mkgulp
index 5a6ca20..a1fdb42 100755
--- a/gulp-6.1.orig/Src/mkgulp
+++ b/gulp-6.1/Src/mkgulp
@@ -196,7 +196,7 @@ fi
--- gulp-6.1.orig/Src/mkgulp.orig 2022-10-14 05:14:21.541000000 +0200
+++ gulp-6.1/Src/mkgulp 2022-10-18 13:18:12.812436767 +0200
@@ -196,7 +196,7 @@
# Include file directories
#
#--USER--Start
Expand All @@ -14,16 +12,7 @@ index 5a6ca20..a1fdb42 100755
#--USER--End
# If using Macports then use the following instead
#--USER--Start
@@ -230,7 +230,7 @@ case $compiler in
# On the Mac the following is sufficient when using Macports:
# echo 'MLIBS=-L/opt/local/lib/lapack/ -llapack -lblas ' >> makefile
# If using the accelerate framework then leave blank:
- echo 'MLIBS=' >> makefile
+ echo 'MLIBS=-L'${EBROOTFLEXIBLAS}'/lib -lflexiblas' >> makefile
# Or if optimised maths libraries are not available then:
# echo 'MLIBS=lapack.o blas.o' >> makefile
#--USER--End
@@ -238,7 +238,7 @@ case $compiler in
@@ -242,7 +242,7 @@
else
# NB: For gfortran v10 then use these lines
echo 'RUNF90=mpif90 -fallow-argument-mismatch ' >> makefile
Expand All @@ -32,7 +21,7 @@ index 5a6ca20..a1fdb42 100755
# echo 'RUNF90=mpif90 ' >> makefile
# echo 'RUNCC=mpif90 ' >> makefile
#
@@ -247,14 +247,14 @@ case $compiler in
@@ -251,14 +251,14 @@
# On the Mac the following is sufficient when using Macports:
# echo 'MLIBS=-L/opt/local/lib/lapack/ -llapack -lblas ' >> makefile
# If using the accelerate framework then leave blank:
Expand All @@ -49,7 +38,7 @@ index 5a6ca20..a1fdb42 100755
# echo 'SLIBS=-L/opt/local/lib -lscalapack ' >> makefile
#--USER--End
fi
@@ -363,11 +363,11 @@ else
@@ -371,11 +371,11 @@
echo 'FDEFS=-DFFTW3 ' >> makefile
if [ "$parallel" = "" ]
#--USER--Start
Expand Down