Skip to content

Commit

Permalink
Fix pre-26.0 Erlang/OTP support that relies on individual OTP applica…
Browse files Browse the repository at this point in the history
…tions release directories without archive output (empty directories) that causes include_lib problems.
  • Loading branch information
okeuday committed Jun 3, 2023
1 parent 58573e8 commit 41a55f6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/ChangeLog
Expand Up @@ -6,6 +6,9 @@
* Improve external service exit status log output when an error
occurs during the fork-exec sequence in cloudi_os_spawn
(e.g. "OS spawn error exec_ENOENT")
* Fix pre-26.0 Erlang/OTP support that relies on individual
OTP applications release directories without archive output
(empty directories) that causes include_lib problems

2023-06-01 Michael Truog <mjtruog at protonmail dot com>

Expand Down
9 changes: 7 additions & 2 deletions src/configure.ac
Expand Up @@ -823,14 +823,19 @@ ERL_ARGS_FILE_PARSE="space_merge"
if test "$ERLANG_OTP_VER_MAJOR" -ge 23 ; then
ERL_ARGS_FILE_PARSE="exact"
fi
RELTOOL_CONFIG_EXCL_ARCHIVE=""
if test "$ERLANG_OTP_VER_MAJOR" -lt 26 ; then
RELTOOL_CONFIG_EXCL_ARCHIVE="{excl_archive_filters, [[\".*\"]]},"
fi
VM_CONFIG_INET_BACKEND_SOCKET=""
# gen_udp multicast support is not yet present in Erlang/OTP 25 socket backend
#if test "$ERLANG_OTP_VER_MAJOR" -ge 26 ; then
# gen_udp multicast support is not yet present in Erlang/OTP 26 socket backend?
#if test "$ERLANG_OTP_VER_MAJOR" -ge 27 ; then
#VM_CONFIG_INET_BACKEND_SOCKET="{inet_backend, socket},"
#fi
AC_SUBST(ERLC_OPTS)
AC_SUBST(ERL_OPTS)
AC_SUBST(ERL_ARGS_FILE_PARSE)
AC_SUBST(RELTOOL_CONFIG_EXCL_ARCHIVE)
AC_SUBST(VM_CONFIG_INET_BACKEND_SOCKET)

# rebar dependency
Expand Down
3 changes: 3 additions & 0 deletions src/reltool.config.in
Expand Up @@ -12,6 +12,9 @@
"^erts.*/bin/(dialyzer|typer)",
"^erts.*/(doc|info|include|lib|man|src)"]},

% keep beam files exposed for module loading of internal services
@RELTOOL_CONFIG_EXCL_ARCHIVE@

% not including scope script temporary directories
{incl_app_filters, ["^(ebin|include|priv)/"]},

Expand Down

0 comments on commit 41a55f6

Please sign in to comment.