Mon Jul 10 19:42:10 2017 UTC ()
Pullup ticket #5500 - requested by joerg
net/powerdns-recursor: build fix

Revisions pulled up:
- net/powerdns-recursor/distinfo                                1.20
- net/powerdns-recursor/patches/patch-configure                 1.1
- net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4     1.1
- net/powerdns-recursor/patches/patch-version.cc                1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Mon Jul  3 13:02:38 UTC 2017

   Modified Files:
   	pkgsrc/net/powerdns-recursor: distinfo
   Added Files:
   	pkgsrc/net/powerdns-recursor/patches: patch-configure
   	    patch-m4_pdns__check__os.m4 patch-version.cc

   Log Message:
   Make Bart write "I will not ignore autoconf warnings" a thousand times.
   While here, don't include the configure arguments in the binary to avoid
   the wrkdir references.


(bsiegert)
diff -r1.19 -r1.19.2.1 pkgsrc/net/powerdns-recursor/distinfo
diff -r0 -r1.1.2.2 pkgsrc/net/powerdns-recursor/patches/patch-configure
diff -r0 -r1.1.2.2 pkgsrc/net/powerdns-recursor/patches/patch-m4_pdns__check__os.m4
diff -r0 -r1.1.2.2 pkgsrc/net/powerdns-recursor/patches/patch-version.cc

cvs diff -r1.19 -r1.19.2.1 pkgsrc/net/powerdns-recursor/distinfo (expand / switch to unified diff)

--- pkgsrc/net/powerdns-recursor/distinfo 2017/06/15 07:15:57 1.19
+++ pkgsrc/net/powerdns-recursor/distinfo 2017/07/10 19:42:10 1.19.2.1
@@ -1,11 +1,14 @@ @@ -1,11 +1,14 @@
1$NetBSD: distinfo,v 1.19 2017/06/15 07:15:57 fhajny Exp $ 1$NetBSD: distinfo,v 1.19.2.1 2017/07/10 19:42:10 bsiegert Exp $
2 2
3SHA1 (pdns-recursor-4.0.5.tar.bz2) = 2f9fcab4a759ed4f21f8f1233b91ad6ef8b5545e 3SHA1 (pdns-recursor-4.0.5.tar.bz2) = 2f9fcab4a759ed4f21f8f1233b91ad6ef8b5545e
4RMD160 (pdns-recursor-4.0.5.tar.bz2) = 3cf3594ab6ede39a1400cb21e2905217d735bc4e 4RMD160 (pdns-recursor-4.0.5.tar.bz2) = 3cf3594ab6ede39a1400cb21e2905217d735bc4e
5SHA512 (pdns-recursor-4.0.5.tar.bz2) = 30d41033d4650a496b2a699b03c8cb5adb3e803420330f09159cf7ca2ce1bab4818f4a9c9ce7a99d2676e31b1e30289198af1f049cd1f309b93f6aa1a05d4cb5 5SHA512 (pdns-recursor-4.0.5.tar.bz2) = 30d41033d4650a496b2a699b03c8cb5adb3e803420330f09159cf7ca2ce1bab4818f4a9c9ce7a99d2676e31b1e30289198af1f049cd1f309b93f6aa1a05d4cb5
6Size (pdns-recursor-4.0.5.tar.bz2) = 1066145 bytes 6Size (pdns-recursor-4.0.5.tar.bz2) = 1066145 bytes
 7SHA1 (patch-configure) = f6984cae95786514c9fa19884755374f1c97df11
7SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68 8SHA1 (patch-dns.hh) = 7e9c1b10a066a605b74ebdbee2d894aed50f6c68
8SHA1 (patch-ext_json11_json11.cpp) = 2de8ea8b51556bd3e3c1a88f681697eff239ab1a 9SHA1 (patch-ext_json11_json11.cpp) = 2de8ea8b51556bd3e3c1a88f681697eff239ab1a
9SHA1 (patch-iputils.hh) = 9de7c58db7468da9fd2a175464becdbe339fac9d 10SHA1 (patch-iputils.hh) = 9de7c58db7468da9fd2a175464becdbe339fac9d
10SHA1 (patch-kqueuemplexer.cc) = 87b3b6670393ee60fc96cf91c5acf575adfd06c0 11SHA1 (patch-kqueuemplexer.cc) = 87b3b6670393ee60fc96cf91c5acf575adfd06c0
 12SHA1 (patch-m4_pdns__check__os.m4) = 04ed7580d9cff6456c3ebcc5bc78a603af1d59a4
11SHA1 (patch-qtype.hh) = f14eb9ad7efc7dd4a0ce220c1f93044ef69e99c2 13SHA1 (patch-qtype.hh) = f14eb9ad7efc7dd4a0ce220c1f93044ef69e99c2
 14SHA1 (patch-version.cc) = 117d440f16c9095c03e28b305b85e03ea6e65c8a

File Added: pkgsrc/net/powerdns-recursor/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.1.2.2 2017/07/10 19:42:10 bsiegert Exp $

Regenerate for PDNS_CHECK_OS fix.

--- configure.orig	2017-07-02 23:26:02.024754888 +0000
+++ configure
@@ -15885,17 +15885,14 @@ fi
 
   case "$host" in
   mips* | powerpc* )
-    as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_cannot continue" "$LINENO" 5
-    _-latomic" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -latomic" >&5
+    { $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 eval \${$as_CACHEVAR+:} false; then :
+if ${ax_cv_check_ldflags___latomic+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
   ax_check_save_flags=$LDFLAGS
-  LDFLAGS="$LDFLAGS cannot continue" "$LINENO" 5
-     -latomic"
+  LDFLAGS="$LDFLAGS  -latomic"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15908,24 +15905,23 @@ main ()
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  eval "$as_CACHEVAR=yes"
+  ax_cv_check_ldflags___latomic=yes
 else
-  eval "$as_CACHEVAR=no"
+  ax_cv_check_ldflags___latomic=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$ax_check_save_flags
 fi
-eval ac_res=\$$as_CACHEVAR
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-   :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___latomic" >&5
+$as_echo "$ax_cv_check_ldflags___latomic" >&6; }
+if test "x$ax_cv_check_ldflags___latomic" = xyes; then :
+  LDFLAGS="-latomic $LDFLAGS"
+      as_fn_error $? "Unable to link against libatomic, cannot continue" "$LINENO" 5
 else
-  as_fn_error $? "Unable to link against libatomic
+  :
 fi
 
-    LDFLAGS="-latomic $LDFLAGS"
     ;;
   esac
 

File Added: pkgsrc/net/powerdns-recursor/patches/Attic/patch-m4_pdns__check__os.m4
$NetBSD: patch-m4_pdns__check__os.m4,v 1.1.2.2 2017/07/10 19:42:10 bsiegert Exp $

Third argument is a instruction list.

--- m4/pdns_check_os.m4.orig	2017-06-13 09:58:51.000000000 +0000
+++ m4/pdns_check_os.m4
@@ -37,11 +37,8 @@ AC_DEFUN([PDNS_CHECK_OS],[
 
   case "$host" in
   mips* | powerpc* )
-    AX_CHECK_LINK_FLAG([-latomic],
-      [ : ],
-      AC_MSG_ERROR([Unable to link against libatomic, cannot continue])
-    )
-    LDFLAGS="-latomic $LDFLAGS"
+    AX_CHECK_LINK_FLAG([-latomic],[LDFLAGS="-latomic $LDFLAGS"]
+      [AC_MSG_ERROR([Unable to link against libatomic, cannot continue])])
     ;;
   esac
 

File Added: pkgsrc/net/powerdns-recursor/patches/patch-version.cc
$NetBSD: patch-version.cc,v 1.1.2.2 2017/07/10 19:42:10 bsiegert Exp $

Don't include build time noise.

--- version.cc.orig	2017-07-03 00:20:50.928274609 +0000
+++ version.cc
@@ -108,13 +108,6 @@ void showBuildConfiguration()
   // Auth only
   theL()<<Logger::Warning<<"Built-in modules: "<<PDNS_MODULES<<endl;
 #endif
-#ifdef PDNS_CONFIG_ARGS
-#define double_escape(s) #s
-#define escape_quotes(s) double_escape(s)
-  theL()<<Logger::Warning<<"Configured with: "<<escape_quotes(PDNS_CONFIG_ARGS)<<endl;
-#undef escape_quotes
-#undef double_escape
-#endif
 }
 
 string fullVersionString()