diff options
| author | James Taylor <james@jtaylor.id.au> | 2019-07-03 20:23:45 +1000 |
|---|---|---|
| committer | Eneas Queiroz <cotequeiroz@gmail.com> | 2019-07-03 11:51:36 -0300 |
| commit | 41c2f33698f79da2203964d93454b203f5ac0513 (patch) | |
| tree | 8f8a2fc89b164e8239e550aa5a7797d7b8c8b5e8 /net/pdns/patches | |
| parent | e2aa918e0e061c819f58f2f406392d97d80be30a (diff) | |
pdns: correct incomplete fix for build failure
Maintainer: me
This commit addresses a build failure around guards on execinfo.h usage to
prevent uclibc from pulling it in, as it defines both __GLIBC__ and __UCLIBC__.
The original patch had invalid syntax which this corrects.
Signed-off-by: James Taylor <james@jtaylor.id.au>
Diffstat (limited to 'net/pdns/patches')
| -rw-r--r-- | net/pdns/patches/500-fix-uclibc-pretending-to-be-glibc.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/pdns/patches/500-fix-uclibc-pretending-to-be-glibc.patch b/net/pdns/patches/500-fix-uclibc-pretending-to-be-glibc.patch index 437b36ba4..f3d10208e 100644 --- a/net/pdns/patches/500-fix-uclibc-pretending-to-be-glibc.patch +++ b/net/pdns/patches/500-fix-uclibc-pretending-to-be-glibc.patch @@ -17,7 +17,7 @@ index e6686787b3..209db7af89 100644 } -#ifdef __GLIBC__ -+#ifdef __GLIBC__ && !defined(__UCLIBC__) ++#if defined(__GLIBC__) && !defined(__UCLIBC__) #include <execinfo.h> static void tbhandler(int num) { @@ -26,7 +26,7 @@ index e6686787b3..209db7af89 100644 s_starttime=time(0); -#ifdef __GLIBC__ -+#ifdef __GLIBC__ && !defined(__UCLIBC__) ++#if defined(__GLIBC__) && !defined(__UCLIBC__) signal(SIGSEGV,tbhandler); signal(SIGFPE,tbhandler); signal(SIGABRT,tbhandler); @@ -35,7 +35,7 @@ index e6686787b3..209db7af89 100644 // we really need to do work - either standalone or as an instance -#ifdef __GLIBC__ -+#ifdef __GLIBC__ && !defined(__UCLIBC__) ++#if defined(__GLIBC__) && !defined(__UCLIBC__) if(!::arg().mustDo("traceback-handler")) { g_log<<Logger::Warning<<"Disabling traceback handler"<<endl; signal(SIGSEGV,SIG_DFL); |