JAVA include/linux dir added, see easybuilders#15424

sassy-crick · Dec 20, 2024 · 6d0eb67 · 6d0eb67
1 parent 7523bb5
commit 6d0eb67
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/easybuild/easyconfigs/g/GCAM/GCAM-5.4-GCC-11.2.0-Java-11.eb b/easybuild/easyconfigs/g/GCAM/GCAM-5.4-GCC-11.2.0-Java-11.eb
@@ -55,7 +55,7 @@ components = [
         'patches': ['GCAM-5.4-environment.patch'],
         'checksums': [
             '0194714cf30b96de1a202c9204b3079a40eee123f2dc1600fa57825c61e8d8f9',  # gcam-v5.4.tar.gz
-            '45f335ceff780237cfad5527422f4367f791fe0e2898a989f80abc129ca61efd',  # GCAM-5.4-environment.patch
+            '83201d1e10ce5af9302b0cb8376c7e86ecd48ee397bccf38f604118eda8583ca',  # GCAM-5.4-environment.patch
         ],
         'start_dir': 'gcam-core-%(namelower)s-v%(version)s',
         'prebuildopts': 'cd cvs/objects/build/linux && ',

diff --git a/easybuild/easyconfigs/g/GCAM/GCAM-5.4-GCC-11.2.0-Java-17.eb b/easybuild/easyconfigs/g/GCAM/GCAM-5.4-GCC-11.2.0-Java-17.eb
@@ -55,7 +55,7 @@ components = [
         'patches': ['GCAM-5.4-environment.patch'],
         'checksums': [
             '0194714cf30b96de1a202c9204b3079a40eee123f2dc1600fa57825c61e8d8f9',  # gcam-v5.4.tar.gz
-            '45f335ceff780237cfad5527422f4367f791fe0e2898a989f80abc129ca61efd',  # GCAM-5.4-environment.patch
+            '83201d1e10ce5af9302b0cb8376c7e86ecd48ee397bccf38f604118eda8583ca',  # GCAM-5.4-environment.patch
         ],
         'start_dir': 'gcam-core-%(namelower)s-v%(version)s',
         'prebuildopts': 'cd cvs/objects/build/linux && ',

diff --git a/easybuild/easyconfigs/g/GCAM/GCAM-5.4-environment.patch b/easybuild/easyconfigs/g/GCAM/GCAM-5.4-environment.patch
@@ -91,7 +91,7 @@ index 684d000..fe951ab 100644
  ## custom values set by environment variables
 -OSNAME_LOWERCASE := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 -JAVAINC = -I$(JAVA_INCLUDE) -I$(JAVA_INCLUDE)/$(OSNAME_LOWERCASE)
-+JAVAINC = -I$(JAVA_INCLUDE)
++JAVAINC = -I$(JAVA_INCLUDE) -I$(JAVA_INCLUDE)/linux
  JAVALIB = -L$(JAVA_LIB)
  JAVA_RPATH = -Wl,-rpath,$(JAVA_LIB)
  JAVALINK = -ljvm