Thu Aug 24 20:59:22 2017 UTC ()
Omit the insistence on -latomic on mips and powerpc if we're on NetBSD.
No PKGREVISION bump, no change for other platforms, and this is a build fix
for those affected by the problem.


(he)
diff -r1.25 -r1.26 pkgsrc/net/powerdns/distinfo
diff -r0 -r1.6 pkgsrc/net/powerdns/patches/patch-configure
diff -r0 -r1.1 pkgsrc/net/powerdns/patches/patch-m4_pdns__check__os.m4
cvs diff -r1.25 -r1.26 pkgsrc/net/powerdns/distinfo (expand / switch to unified diff)

--- pkgsrc/net/powerdns/distinfo 2017/06/23 17:12:54 1.25
+++ pkgsrc/net/powerdns/distinfo 2017/08/24 20:59:22 1.26
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1$NetBSD: distinfo,v 1.25 2017/06/23 17:12:54 fhajny Exp $ 1$NetBSD: distinfo,v 1.26 2017/08/24 20:59:22 he Exp $
2 2
3SHA1 (pdns-4.0.4.tar.bz2) = 27a7421d363e2d8c6dac1404a8c1c96bc6e93f46 3SHA1 (pdns-4.0.4.tar.bz2) = 27a7421d363e2d8c6dac1404a8c1c96bc6e93f46
4RMD160 (pdns-4.0.4.tar.bz2) = b21f87c79162d3a6b1952d96093088ede17e9690 4RMD160 (pdns-4.0.4.tar.bz2) = b21f87c79162d3a6b1952d96093088ede17e9690
5SHA512 (pdns-4.0.4.tar.bz2) = 4ef4705cd990b03976775167c7c37850d45907e198549feda5f5701172e008e3f1f74a35a9bebdb24b63dec15ff63cb2cc9dfc8f92e4e1012e0539c5a88b845b 5SHA512 (pdns-4.0.4.tar.bz2) = 4ef4705cd990b03976775167c7c37850d45907e198549feda5f5701172e008e3f1f74a35a9bebdb24b63dec15ff63cb2cc9dfc8f92e4e1012e0539c5a88b845b
6Size (pdns-4.0.4.tar.bz2) = 1320327 bytes 6Size (pdns-4.0.4.tar.bz2) = 1320327 bytes
 7SHA1 (patch-configure) = f5f4c2d9b635b223f2379a330bfae497ef62191e
7SHA1 (patch-ext_json11_json11.cpp) = a8ffe67156a836841aef8a6bba134a82283f381e 8SHA1 (patch-ext_json11_json11.cpp) = a8ffe67156a836841aef8a6bba134a82283f381e
 9SHA1 (patch-m4_pdns__check__os.m4) = db98d2c892f2e53e42745026749f2ab2a691ed4a
8SHA1 (patch-pdns_dns.hh) = 626eb4e29b7fcd82fbe056036c157c1e85fa49ca 10SHA1 (patch-pdns_dns.hh) = 626eb4e29b7fcd82fbe056036c157c1e85fa49ca
9SHA1 (patch-pdns_dnsscope.cc) = b289b750686b25041c3e291fb0d3d562beb36eaf 11SHA1 (patch-pdns_dnsscope.cc) = b289b750686b25041c3e291fb0d3d562beb36eaf
10SHA1 (patch-pdns_iputils.hh) = 7507f6b080c9aa5e71068b3e9e92e71de6fc2b15 12SHA1 (patch-pdns_iputils.hh) = 7507f6b080c9aa5e71068b3e9e92e71de6fc2b15
11SHA1 (patch-pdns_qtype.hh) = 0f8bca4c0cafea9a5257a08077fa42b4c52127f5 13SHA1 (patch-pdns_qtype.hh) = 0f8bca4c0cafea9a5257a08077fa42b4c52127f5
File Added: pkgsrc/net/powerdns/patches/patch-configure
$NetBSD: patch-configure,v 1.6 2017/08/24 20:59:22 he Exp $

Regen after excluding -latomic test on NetBSD.

--- configure.orig	2017-08-24 16:29:40.591346034 +0000
+++ configure
@@ -5567,9 +5567,14 @@ else
 fi
 
 
-  case "$host" in
-  mips* | powerpc* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
+  case "$host_os" in
+  netbsd*)
+    : # no -latomic
+    ;;
+  *)
+    case "$host" in
+    mips* | powerpc* )
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
 $as_echo_n "checking whether the linker accepts -latomic... " >&6; }
 if ${ax_cv_check_ldflags___latomic+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5606,7 +5611,9 @@ else
 
 fi
 
-    LDFLAGS="-latomic $LDFLAGS"
+      LDFLAGS="-latomic $LDFLAGS"
+      ;;
+    esac
     ;;
   esac
File Added: pkgsrc/net/powerdns/patches/Attic/patch-m4_pdns__check__os.m4
$NetBSD: patch-m4_pdns__check__os.m4,v 1.1 2017/08/24 20:59:22 he Exp $

Don't insist on -latomic on mips & powerpc if on NetBSD.

--- m4/pdns_check_os.m4.orig	2017-06-22 20:07:25.000000000 +0000
+++ m4/pdns_check_os.m4
@@ -35,13 +35,20 @@ AC_DEFUN([PDNS_CHECK_OS],[
   AM_CONDITIONAL([HAVE_LINUX], [test "x$have_linux" = "xyes"])
   AM_CONDITIONAL([HAVE_SOLARIS], [test "x$have_solaris" = "xyes"])
 
-  case "$host" in
-  mips* | powerpc* )
-    AX_CHECK_LINK_FLAG([-latomic],
-      [ : ],
-      [ AC_MSG_ERROR([Unable to link against libatomic, cannot continue]) ]
-    )
-    LDFLAGS="-latomic $LDFLAGS"
+  case "$host_os" in
+  netbsd*)
+    : # no -latomic
+    ;;
+  *)
+    case "$host" in
+    mips* | powerpc* )
+      AX_CHECK_LINK_FLAG([-latomic],
+        [ : ],
+        [ AC_MSG_ERROR([Unable to link against libatomic, cannot continue]) ]
+      )
+      LDFLAGS="-latomic $LDFLAGS"
+      ;;
+    esac
     ;;
   esac