Support Erlang/OTP up to 29 and modernize the build

.github/workflows/main.yml

@@ -11,12 +11,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - erlang: 25.0.4-alpine-3.16.1
-          # - erlang: 24.3.4.4-alpine-3.16.1 # appears to have a broken 'ssl' library
-          - erlang: 23.3.4.16-alpine-3.16.0
+          - erlang: 29.0.3-alpine-3.24.1
+          - erlang: 28.5.0.3-alpine-3.24.1
+          - erlang: 27.3.4.14-alpine-3.24.1
+          - erlang: 26.2.5.21-alpine-3.24.1
+          - erlang: 25.3.2.21-alpine-3.22.5
+          - erlang: 24.3.4.17-alpine-3.22.5
+          - erlang: 23.3.4.20-alpine-3.16.9
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
 
       - name: Setup
         run: |
@@ -27,7 +31,7 @@ jobs:
           make docker-test DOCKER_OTP_VERSION=${{matrix.erlang}}
 
       - name: Logs
-        uses: actions/upload-artifact@v2-preview
+        uses: actions/upload-artifact@v7
         if: failure()
         with:
           name: ct-logs-${{matrix.erlang}}

build.config

@@ -6,17 +6,24 @@
 # Core modules.
 core/core
 core/kerl
+
+# Index and dependencies.
 index/*
 core/index
 core/deps
 
 # Core modules, continued.
+core/beam-cache
 core/erlc
+core/elixir
 core/docs
 core/rel
 core/test
 core/compat
 
+# Built-in templates.
+templates
+
 # Plugins.
 plugins/asciidoc
 plugins/bootstrap
@@ -47,4 +54,4 @@ plugins/sfx
 core/plugins
 
 # Core modules which can use variables from plugins.
-core/deps-tools
+core/deps-tools

c_src/Makefile

@@ -94,6 +94,9 @@ ifneq ($(CROSSCOMPILER),)
 	CC = $(CROSSCOMPILER)gcc
 endif
 
+# Expose POSIX.1-2008 declarations (e.g. strnlen) despite -std=c17.
+CPPFLAGS += -D_DEFAULT_SOURCE
+
 CFLAGS += -I"$(ERTS_INCLUDE_DIR)" -I"$(ERL_INTERFACE_INCLUDE_DIR)" -I"$(LIBSODIUM_INCLUDE_DIR)"
 CXXFLAGS += -I"$(ERTS_INCLUDE_DIR)" -I"$(ERL_INTERFACE_INCLUDE_DIR)" -I"$(LIBSODIUM_INCLUDE_DIR)"
 
@@ -189,7 +192,7 @@ $(LIBSODIUM_CONFIGURE_FILE): $(LIBSODIUM_SRC_DIR)
 	$(verbose) if [ ! -f $(LIBSODIUM_CONFIGURE_FILE) ]; then \
 		(cd $(LIBSODIUM_SRC_DIR) \
 			&& chmod +x $(LIBSODIUM_AUTOGEN_FILE) \
-			&& $(LIBSODIUM_AUTOGEN_FILE)); \
+			&& DO_NOT_UPDATE_CONFIG_SCRIPTS=1 $(LIBSODIUM_AUTOGEN_FILE)); \
 	else \
 		true; \
 	fi

c_src/drv/libsodium_api.h

@@ -21,8 +21,6 @@ typedef struct libsodium_namespace {
     ErlDrvTermData am_namespace;
 } libsodium_namespace_t;
 
-extern int erts_fprintf(FILE *stream, const char *format, ...);
-
 extern void init_libsodium_api(void);
 extern libsodium_function_t *get_libsodium_api(const char *namespace, const char *function);
 

c_src/drv/libsodium_drv.c

@@ -11,7 +11,7 @@
 static void
 libsodium_drv_misuse_handler(void)
 {
-    erts_fprintf(stderr, "FATAL ERROR: sodium_misuse() called\n");
+    fprintf(stderr, "FATAL ERROR: sodium_misuse() called\n");
     return;
 }
 

c_src/drv/libsodium_drv_common.h

@@ -13,8 +13,6 @@
 #include <stdio.h>
 #include <sodium.h>
 
-extern int erts_fprintf(FILE *, const char *, ...);
-
 // #define TRACE	1
 #ifdef TRACE
 #define TRACE_C(c)                                                                                                                 \
@@ -27,7 +25,7 @@ extern int erts_fprintf(FILE *, const char *, ...);
         fputs((s), stdout);                                                                                                        \
         fflush(stdout);                                                                                                            \
     } while (0)
-#define TRACE_F(...) erts_fprintf(stderr, __VA_ARGS__)
+#define TRACE_F(...) fprintf(stderr, __VA_ARGS__)
 #else
 #define TRACE_C(c) ((void)(0))
 #define TRACE_S(s) ((void)(0))