asterisk: update to 18.2.2

Patches removed because uclibc was dropped:

001-disable-semaphores-on-uclibc-otherwise-allow.patch
002-configure-fix-detection-of-re-entrant-resolver-funct.patch

Patches updated/refreshed:

100-build-reproducibly.patch
140-use-default-lua.patch

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper
2021-03-14 18:14:41 +01:00
parent 5a916dc351
commit d6fe18bcdc
5 changed files with 7 additions and 72 deletions

View File

@@ -1,15 +1,11 @@
--- a/configure.ac
+++ b/configure.ac
@@ -2564,7 +2564,11 @@ if test -z "$__opus_include" -o x"$__opu
@@ -2560,7 +2560,7 @@ if test -z "$__opus_include" -o x"$__opu
fi
AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
-for ver in 5.4 5.3 5.2 5.1; do
+# This does not work for us. We have both liblua and liblua5.3 in
+# $(STAGING_DIR)/usr. But the headers for liblua5.3 are in
+# (STAGING_DIR)/usr/include/lua5.3. Using the below, Asterisk would
+# use the headers from liblua and link against liblua5.3 :/
+for ver in ; do
-for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
+for ver in ${LUA_VERSIONS}; do
AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then