mirror of
https://github.com/openwrt/telephony.git
synced 2025-12-21 19:14:34 +04:00
a572285886
- add "--disable-android-mediacodec" to configure - add EXCLUDE_APP=1 to "make" calls so some apps aren't built (speeds up the build a bit) - drop "sed" call as no longer needed - drop uclibc related patches (0002-uclibc-linker-unrecognized-options.patch and 0003-non-gnu-pthreads.patch) - update 0004-config_site.patch to sync up with Asterisk 18.14.0 - drop 0005-remove-hardcoded-lstdc++.patch as uclibcxx was removed from OpenWrt - update 0006-fix-pkg_config-file.patch as there were some changes in this area upstream - add 0007-execinfo.patch to prevent errors due to missing <execinfo.h> - sync patches with 18.14.0 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
72 lines
2.0 KiB
Diff
72 lines
2.0 KiB
Diff
In upstream commit b236337 unit tests were extended to print stack traces when
|
|
crashing, using GNU extensions. But this won't work with musl etc. (no
|
|
"execinfo.h"), so we need to update the condition to make sure this is only
|
|
done when glibc is used.
|
|
|
|
--- a/pjlib-util/src/pjlib-util-test/main.c
|
|
+++ b/pjlib-util/src/pjlib-util-test/main.c
|
|
@@ -33,7 +33,7 @@ static void init_signals()
|
|
sigaction(SIGALRM, &act, NULL);
|
|
}
|
|
|
|
-#elif PJ_LINUX || PJ_DARWINOS
|
|
+#elif (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || PJ_DARWINOS
|
|
|
|
#include <execinfo.h>
|
|
#include <signal.h>
|
|
--- a/pjlib/src/pjlib-test/main.c
|
|
+++ b/pjlib/src/pjlib-test/main.c
|
|
@@ -54,7 +54,7 @@ static void init_signals()
|
|
sigaction(SIGALRM, &act, NULL);
|
|
}
|
|
|
|
-#elif PJ_LINUX || PJ_DARWINOS
|
|
+#elif (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || PJ_DARWINOS
|
|
|
|
#include <execinfo.h>
|
|
#include <signal.h>
|
|
--- a/pjmedia/src/test/main.c
|
|
+++ b/pjmedia/src/test/main.c
|
|
@@ -32,7 +32,7 @@
|
|
#endif
|
|
|
|
|
|
-#if PJ_LINUX || PJ_DARWINOS
|
|
+#if (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || PJ_DARWINOS
|
|
|
|
#include <execinfo.h>
|
|
#include <signal.h>
|
|
--- a/pjnath/src/pjnath-test/main.c
|
|
+++ b/pjnath/src/pjnath-test/main.c
|
|
@@ -32,7 +32,7 @@ static void init_signals()
|
|
sigaction(SIGALRM, &act, NULL);
|
|
}
|
|
|
|
-#elif PJ_LINUX || PJ_DARWINOS
|
|
+#elif (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || PJ_DARWINOS
|
|
|
|
#include <execinfo.h>
|
|
#include <signal.h>
|
|
--- a/pjsip-apps/src/pjsua/main.c
|
|
+++ b/pjsip-apps/src/pjsua/main.c
|
|
@@ -80,7 +80,7 @@ static void setup_signal_handler(void)
|
|
SetConsoleCtrlHandler(&CtrlHandler, TRUE);
|
|
}
|
|
|
|
-#elif PJ_LINUX || PJ_DARWINOS
|
|
+#elif (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || PJ_DARWINOS
|
|
|
|
#include <execinfo.h>
|
|
#include <signal.h>
|
|
--- a/pjsip/src/test/main.c
|
|
+++ b/pjsip/src/test/main.c
|
|
@@ -36,7 +36,7 @@ static void usage(void)
|
|
list_tests();
|
|
}
|
|
|
|
-#if PJ_LINUX || PJ_DARWINOS
|
|
+#if (defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)) || PJ_DARWINOS
|
|
|
|
#include <execinfo.h>
|
|
#include <signal.h>
|