Support rebuilding on Ubuntu 24.04 (#176)

* rebuilding on Ubuntu 24.04 æsupport * use Node 18 for bundled tests * modify both configs * add missing endif * include `features.h` * check against glibc and not gcc
mmomtchev · Aug 30, 2024 · 9e51e19 · 9e51e19
1 parent adcdeb9
commit 9e51e19
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml
@@ -92,7 +92,7 @@ jobs:
 
     strategy:
       matrix:
-        linux-version: [ 'amazonlinux:2022' ]
+        linux-version: [ 'amazonlinux:2022', 'ubuntu:24.04' ]
 
     steps:
     - uses: actions/checkout@v4
@@ -105,7 +105,7 @@ jobs:
       with:
         max-size: 1000M
         key: distros-bundled-${{ matrix.linux-version }}
-    - run: npm run container dev ${{ matrix.linux-version }} 16 bundled
+    - run: npm run container dev ${{ matrix.linux-version }} 18 bundled
       env:
         MOCHA_TEST_NETWORK: ${{ github.event.inputs.testNetwork }}
 

diff --git a/deps/libnetcdf/config.h b/deps/libnetcdf/config.h
@@ -124,6 +124,12 @@
 #define USE_HDF5 1
 #define USE_NETCDF4 1
 #define USE_NETCDF_2 1
+
+#include <gnu/libc-version.h>
+#include <features.h>
+#if __GLIBC_PREREQ(2, 38)
+#define HAVE_STRLCAT 1
+#endif
 #endif
 
 #ifdef WIN32

diff --git a/deps/libnetcdf/netcdf/config.h b/deps/libnetcdf/netcdf/config.h
@@ -124,6 +124,12 @@
 #define USE_HDF5 1
 #define USE_NETCDF4 1
 #define USE_NETCDF_2 1
+
+#include <gnu/libc-version.h>
+#include <features.h>
+#if __GLIBC_PREREQ(2, 38)
+#define HAVE_STRLCAT 1
+#endif
 #endif
 
 #ifdef WIN32