Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pdns: correct incomplete fix for build failure

Browse source 
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>
This commit is contained in:
James Taylor 2019-07-03 20:23:45 +10:00 committed by Eneas Queiroz
parent e2aa918e0e
commit 41c2f33698
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/pdns/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pdns PKG_NAME:=pdns
PKG_VERSION:=4.1.10 PKG_VERSION:=4.1.10
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/

6
net/pdns/patches/500-fix-uclibc-pretending-to-be-glibc.patch
View file

@ -17,7 +17,7 @@ index e6686787b3..209db7af89 100644
} }
-#ifdef __GLIBC__ -#ifdef __GLIBC__
+#ifdef __GLIBC__ && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__)
#include <execinfo.h> #include <execinfo.h>
static void tbhandler(int num) static void tbhandler(int num)
{ {
@ -26,7 +26,7 @@ index e6686787b3..209db7af89 100644
s_starttime=time(0); s_starttime=time(0);
-#ifdef __GLIBC__ -#ifdef __GLIBC__
+#ifdef __GLIBC__ && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__)
signal(SIGSEGV,tbhandler); signal(SIGSEGV,tbhandler);
signal(SIGFPE,tbhandler); signal(SIGFPE,tbhandler);
signal(SIGABRT,tbhandler); signal(SIGABRT,tbhandler);
@ -35,7 +35,7 @@ index e6686787b3..209db7af89 100644
// we really need to do work - either standalone or as an instance // we really need to do work - either standalone or as an instance
-#ifdef __GLIBC__ -#ifdef __GLIBC__
+#ifdef __GLIBC__ && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__)
if(!::arg().mustDo("traceback-handler")) { if(!::arg().mustDo("traceback-handler")) {
g_log<<Logger::Warning<<"Disabling traceback handler"<<endl; g_log<<Logger::Warning<<"Disabling traceback handler"<<endl;
signal(SIGSEGV,SIG_DFL); signal(SIGSEGV,SIG_DFL);