From 41c2f33698f79da2203964d93454b203f5ac0513 Mon Sep 17 00:00:00 2001 From: James Taylor Date: Wed, 3 Jul 2019 20:23:45 +1000 Subject: [PATCH] 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 --- net/pdns/Makefile | 2 +- .../patches/500-fix-uclibc-pretending-to-be-glibc.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/pdns/Makefile b/net/pdns/Makefile index 8bc80535a..09b204b12 100644 --- a/net/pdns/Makefile +++ b/net/pdns/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pdns PKG_VERSION:=4.1.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ 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 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<