mirror of
https://github.com/openwrt/telephony.git
synced 2025-12-21 17:04:36 +04:00
4f4e681c20
This is a manual cherry-pick of commitaa3bc352e7as well as commitb71770db41. The latter is currently in a pull request to update asterisk to 18.15.1 in the openwrt-22.03 branch. - add new modules - res-geolocation depends on asterisk being built with libxlt support, but to make libxslt a general dependency is probably not a good idea for small devices, so this adds a config option ASTERISK_LIBXSLT_SUPPORT that is off by default except on x86_64 builds - refresh patches - 180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch removed as included in upstream release - added 170-menuselect-force-use-of-xml2-config.patch as upstream switched to use pkg-config for libxml2 detection, which would be fine, except OpenWrt's host libxml2 is static and Asterisk can't handle that - the bump to 18.15.1 contains fixes for AST-2022-007, AST-2022-008 and AST-2022-009 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
29 lines
872 B
Diff
29 lines
872 B
Diff
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1092,15 +1092,18 @@ AC_LINK_IFELSE(
|
|
|
|
# Some platforms define sem_init(), but only support sem_open(). joyous.
|
|
AC_MSG_CHECKING(for working unnamed semaphores)
|
|
-AC_RUN_IFELSE(
|
|
- [AC_LANG_PROGRAM([#include <semaphore.h>],
|
|
- [sem_t sem; return sem_init(&sem, 0, 0);])],
|
|
+AC_LINK_IFELSE(
|
|
+ [AC_LANG_PROGRAM(
|
|
+ [#include <semaphore.h>],
|
|
+ [#if defined(__UCLIBC__)
|
|
+ i_dont_exist sem;
|
|
+ #else
|
|
+ sem_t sem;
|
|
+ #endif
|
|
+ return sem_init(&sem, 0, 0);])],
|
|
AC_MSG_RESULT(yes)
|
|
AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
|
|
- AC_MSG_RESULT(no),
|
|
- AC_MSG_RESULT(cross-compile)
|
|
- AC_MSG_NOTICE([WARNING: result yes guessed because of cross compilation])
|
|
- AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
|
|
+ AC_MSG_RESULT(no)
|
|
)
|
|
|
|
LIBS="$save_LIBS"
|