diff options
author | Nathan Angelacos <nangel@alpinelinux.org> | 2015-09-25 16:38:32 +0000 |
---|---|---|
committer | Francesco Colista <fcolista@alpinelinux.org> | 2015-09-30 06:16:57 +0000 |
commit | 9a181a70bad5b593ea22f93472ba7d9ad1ad3404 (patch) | |
tree | f5c8a4de49d04b997c2aba0ebdb29ba8e2e4f58f /main/sems/sems-0004-musl-fixes.patch | |
parent | dbe6d42e672ef282c6afcb5a15fac55f1e55d284 (diff) | |
download | aports-9a181a70bad5b593ea22f93472ba7d9ad1ad3404.tar.bz2 aports-9a181a70bad5b593ea22f93472ba7d9ad1ad3404.tar.xz |
main/sems version bump to 1.6.0
Diffstat (limited to 'main/sems/sems-0004-musl-fixes.patch')
-rw-r--r-- | main/sems/sems-0004-musl-fixes.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/main/sems/sems-0004-musl-fixes.patch b/main/sems/sems-0004-musl-fixes.patch new file mode 100644 index 0000000000..6302f30b39 --- /dev/null +++ b/main/sems/sems-0004-musl-fixes.patch @@ -0,0 +1,56 @@ +diff --git a/core/AmBasicSipDialog.cpp b/core/AmBasicSipDialog.cpp +index 8a9fc04..d6d5ab7 100644 +--- a/core/AmBasicSipDialog.cpp ++++ b/core/AmBasicSipDialog.cpp +@@ -591,7 +591,7 @@ int AmBasicSipDialog::reply(const AmSipRequest& req, + "remote_tag=%s\n", + req.cseq,code,callid.c_str(), + local_tag.c_str(),remote_tag.c_str()); +- log_stacktrace(L_ERR); ++ // log_stacktrace(L_ERR); + return -1; + } + DBG("reply: transaction found!\n"); +diff --git a/core/log.cpp b/core/log.cpp +index 933657e..efc2ae2 100644 +--- a/core/log.cpp ++++ b/core/log.cpp +@@ -206,6 +206,7 @@ void register_log_hook(AmLoggingFacility* fac) + log_hooks.push_back(fac); + } + ++#ifdef MUSL_SUPPORTS_BACKTRACE + /** + * Print stack-trace through logging function + */ +@@ -300,3 +301,5 @@ void __lds(int ll, unsigned int max_frames) + free(funcname); + free(symbollist); + } ++ ++#endif +diff --git a/core/log.h b/core/log.h +index 253d824..5ffda75 100644 +--- a/core/log.h ++++ b/core/log.h +@@ -33,7 +33,7 @@ + #include <stdio.h> + #include <unistd.h> /* getpid() */ + #include <pthread.h> /* pthread_self() */ +-#include <execinfo.h> /* backtrace_symbols() */ ++// #include <execinfo.h> /* backtrace_symbols() */ + + #ifdef __cplusplus + #include <cxxabi.h> /* __cxa_demangle() */ +diff --git a/core/sems.cpp b/core/sems.cpp +index 6f03e5c..d7030eb 100644 +--- a/core/sems.cpp ++++ b/core/sems.cpp +@@ -69,6 +69,7 @@ + using std::string; + + #if defined(__linux__) ++#include <sys/resource.h> + #include <sys/prctl.h> + #endif + |