forked from easybuilders/easybuild-easyconfigs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
use external EMSF instead of bundled binaries
- Loading branch information
Showing
2 changed files
with
77 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
easybuild/easyconfigs/d/Delft3D/Delft3D-4.04.01_use-external-esmf.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
Author: Jasper Grimm <[email protected]> | ||
Avoid installing the bundled ESMF, since this is compiled for CentOS 7 (and also fails | ||
rpath sanity checks) | ||
diff -Nru trunk.orig/src/configure.ac trunk/src/configure.ac | ||
--- trunk.orig/src/configure.ac 2024-02-20 14:35:26.821778739 +0000 | ||
+++ trunk/src/configure.ac 2024-02-20 14:43:47.108090829 +0000 | ||
@@ -607,10 +607,6 @@ | ||
plugins_lgpl/plugin_delftflow_traform/src/Makefile | ||
scripts_lgpl/linux/Makefile | ||
scripts_lgpl/Makefile | ||
-third_party_open/esmf/lnx64/bin/Makefile | ||
-third_party_open/esmf/lnx64/Makefile | ||
-third_party_open/esmf/lnx64/scripts/Makefile | ||
-third_party_open/esmf/Makefile | ||
third_party_open/Makefile | ||
third_party_open/md5/Makefile | ||
third_party_open/md5/md5digest/Makefile | ||
diff -Nru trunk.orig/src/third_party_open/Makefile.am trunk/src/third_party_open/Makefile.am | ||
--- trunk.orig/src/third_party_open/Makefile.am 2024-02-20 14:35:27.045777956 +0000 | ||
+++ trunk/src/third_party_open/Makefile.am 2024-02-20 14:43:31.552143270 +0000 | ||
@@ -19,7 +19,6 @@ | ||
endif | ||
|
||
SUBDIRS = \ | ||
- esmf \ | ||
triangle \ | ||
version_number \ | ||
libsigwatch \ | ||
@@ -28,39 +27,3 @@ | ||
kdtree2 \ | ||
md5 \ | ||
$(MAYBE_FORTRANGIS) | ||
-nobase_dist_pkgdata_DATA = \ | ||
- esmf/lnx64/bin/libcilkrts.so.5 \ | ||
- esmf/lnx64/bin/libdl.so.2 \ | ||
- esmf/lnx64/bin/libesmf.so \ | ||
- esmf/lnx64/bin/libgcc_s.so.1 \ | ||
- esmf/lnx64/bin/libhdf5.so.8 \ | ||
- esmf/lnx64/bin/libhdf5_hl.so.8 \ | ||
- esmf/lnx64/bin/libifcore.so.5 \ | ||
- esmf/lnx64/bin/libifport.so.5 \ | ||
- esmf/lnx64/bin/libimf.so \ | ||
- esmf/lnx64/bin/libintlc.so.5 \ | ||
- esmf/lnx64/bin/libiomp5.so \ | ||
- esmf/lnx64/bin/libirc.so \ | ||
- esmf/lnx64/bin/libirng.so \ | ||
- esmf/lnx64/bin/libm.so.6 \ | ||
- esmf/lnx64/bin/libnetcdf.so.7 \ | ||
- esmf/lnx64/bin/libnetcdff.so.6 \ | ||
- esmf/lnx64/bin/librt.so.1 \ | ||
- esmf/lnx64/bin/libsvml.so \ | ||
- esmf/lnx64/bin/libz.so.1 \ | ||
- esmf/lnx64/bin_COS7/libcilkrts.so.5 \ | ||
- esmf/lnx64/bin_COS7/libesmf.so \ | ||
- esmf/lnx64/bin_COS7/libhdf5.so.200 \ | ||
- esmf/lnx64/bin_COS7/libhdf5_hl.so.200 \ | ||
- esmf/lnx64/bin_COS7/libifcoremt.so.5 \ | ||
- esmf/lnx64/bin_COS7/libifport.so.5 \ | ||
- esmf/lnx64/bin_COS7/libimf.so \ | ||
- esmf/lnx64/bin_COS7/libintlc.so.5 \ | ||
- esmf/lnx64/bin_COS7/libiomp5.so \ | ||
- esmf/lnx64/bin_COS7/libirc.so \ | ||
- esmf/lnx64/bin_COS7/libirng.so \ | ||
- esmf/lnx64/bin_COS7/libnetcdf.so.7 \ | ||
- esmf/lnx64/bin_COS7/libnetcdf.so.18 \ | ||
- esmf/lnx64/bin_COS7/libnetcdff.so.6 \ | ||
- esmf/lnx64/bin_COS7/libsvml.so | ||
- |