From 70b92492a6d186510eae785ae4e0a34d16055966 Mon Sep 17 00:00:00 2001
From: Simon Branford <s.j.branford@bham.ac.uk>
Date: Thu, 19 Dec 2024 14:40:25 +0000
Subject: [PATCH] add ANTLR using Java/17 and switch NCO-5.2.9-foss-2024a.eb to
 use it

---
 .../ANTLR-2.7.7-GCCcore-13.3.0-Java-17.eb     | 36 +++++++++++++++++++
 .../easyconfigs/n/NCO/NCO-5.2.9-foss-2024a.eb |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-GCCcore-13.3.0-Java-17.eb

diff --git a/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-GCCcore-13.3.0-Java-17.eb b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-GCCcore-13.3.0-Java-17.eb
new file mode 100644
index 00000000000..e614536bfb5
--- /dev/null
+++ b/easybuild/easyconfigs/a/ANTLR/ANTLR-2.7.7-GCCcore-13.3.0-Java-17.eb
@@ -0,0 +1,36 @@
+easyblock = 'ConfigureMake'
+
+name = 'ANTLR'
+version = '2.7.7'
+versionsuffix = '-Java-%(javaver)s'
+
+homepage = 'https://www.antlr2.org/'
+description = """ANTLR, ANother Tool for Language Recognition, (formerly PCCTS)
+ is a language tool that provides a framework for constructing recognizers,
+ compilers, and translators from grammatical descriptions containing
+ Java, C#, C++, or Python actions."""
+
+toolchain = {'name': 'GCCcore', 'version': '13.3.0'}
+
+source_urls = ['https://www.antlr2.org/download/']
+sources = [SOURCELOWER_TAR_GZ]
+patches = ['%(name)s-%(version)s_includes.patch']
+checksums = [
+    '853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9',  # antlr-2.7.7.tar.gz
+    'd167d3248a03301bc93efcb37d5df959aae6794968e42231af0b0dd26d6a2e66',  # ANTLR-2.7.7_includes.patch
+]
+
+builddependencies = [('binutils', '2.42')]
+
+dependencies = [('Java', '17', '', SYSTEM)]
+
+configopts = '--disable-examples --disable-csharp --disable-python'
+
+sanity_check_paths = {
+    'files': ['bin/antlr', 'bin/antlr-config'],
+    'dirs': ['include'],
+}
+
+sanity_check_commands = ["antlr --help"]
+
+moduleclass = 'tools'
diff --git a/easybuild/easyconfigs/n/NCO/NCO-5.2.9-foss-2024a.eb b/easybuild/easyconfigs/n/NCO/NCO-5.2.9-foss-2024a.eb
index cf83d365785..b0a8726462e 100644
--- a/easybuild/easyconfigs/n/NCO/NCO-5.2.9-foss-2024a.eb
+++ b/easybuild/easyconfigs/n/NCO/NCO-5.2.9-foss-2024a.eb
@@ -4,7 +4,7 @@ name = 'NCO'
 version = '5.2.9'
 
 homepage = "https://github.com/nco/nco"
-description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats, 
+description = """The NCO toolkit manipulates and analyzes data stored in netCDF-accessible formats,
 including DAP, HDF4, and HDF5."""
 
 toolchain = {'name': 'foss', 'version': '2024a'}
@@ -21,7 +21,7 @@ builddependencies = [
 dependencies = [
     ('UDUNITS', '2.2.28'),
     ('expat', '2.6.2'),
-    ('ANTLR', '2.7.7', '-Java-21.0.2'),
+    ('ANTLR', '2.7.7', '-Java-17'),
     ('libdap', '3.21.0-131'),
     ('GSL', '2.8'),
     ('netCDF', '4.9.2'),