[pkgsrc/trunk]: pkgsrc/net/libcares libcares: Don't strip out user-supplied d...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3a48d304715d
branches:  trunk
changeset: 372663:3a48d304715d
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Dec 13 15:15:45 2017 +0000

description:
libcares: Don't strip out user-supplied debug flags.

diffstat:

 net/libcares/distinfo                            |   3 +-
 net/libcares/patches/patch-m4_cares-compilers.m4 |  34 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)

diffs (53 lines):

diff -r 76963359a0e7 -r 3a48d304715d net/libcares/distinfo
--- a/net/libcares/distinfo     Wed Dec 13 14:46:04 2017 +0000
+++ b/net/libcares/distinfo     Wed Dec 13 15:15:45 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2017/07/15 17:15:16 wiz Exp $
+$NetBSD: distinfo,v 1.15 2017/12/13 15:15:45 jperkin Exp $
 
 SHA1 (c-ares-1.13.0.tar.gz) = dde50284cc3d505fb2463ff6276e61d5531b1d68
 RMD160 (c-ares-1.13.0.tar.gz) = 97f312aa01d41f381c97ad30a07fbbfdf043f9ea
@@ -6,4 +6,5 @@
 Size (c-ares-1.13.0.tar.gz) = 1446797 bytes
 SHA1 (patch-Makefile.am) = aef2a0e1975aadab33e647752fd44e30fbfb568a
 SHA1 (patch-configure.ac) = 0327491be4565b5121811d42288bd1d79b7c1241
+SHA1 (patch-m4_cares-compilers.m4) = 3a5cf27d33ebb7803eab873c6adfc6a70fa4a782
 SHA1 (patch-m4_xc-cc-check.m4) = b979d60f1ecb5008b145ade55281c6e2a59be613
diff -r 76963359a0e7 -r 3a48d304715d net/libcares/patches/patch-m4_cares-compilers.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libcares/patches/patch-m4_cares-compilers.m4  Wed Dec 13 15:15:45 2017 +0000
@@ -0,0 +1,34 @@
+$NetBSD: patch-m4_cares-compilers.m4,v 1.1 2017/12/13 15:15:45 jperkin Exp $
+
+Don't strip out user-supplied debug flags.
+
+--- m4/cares-compilers.m4.orig 2016-01-23 22:41:55.000000000 +0000
++++ m4/cares-compilers.m4
+@@ -722,13 +722,6 @@ AC_DEFUN([CARES_SET_COMPILER_DEBUG_OPTS]
+       tmp_options="$flags_dbg_off"
+     fi
+     #
+-    if test "$flags_prefer_cppflags" = "yes"; then
+-      CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
+-      CFLAGS="$tmp_CFLAGS"
+-    else
+-      CPPFLAGS="$tmp_CPPFLAGS"
+-      CFLAGS="$tmp_CFLAGS $tmp_options"
+-    fi
+     squeeze CPPFLAGS
+     squeeze CFLAGS
+     CARES_COMPILER_WORKS_IFELSE([
+@@ -803,13 +796,6 @@ AC_DEFUN([CARES_SET_COMPILER_OPTIMIZE_OP
+         AC_MSG_CHECKING([if compiler accepts optimizer disabling options])
+         tmp_options="$flags_opt_off"
+       fi
+-      if test "$flags_prefer_cppflags" = "yes"; then
+-        CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
+-        CFLAGS="$tmp_CFLAGS"
+-      else
+-        CPPFLAGS="$tmp_CPPFLAGS"
+-        CFLAGS="$tmp_CFLAGS $tmp_options"
+-      fi
+       squeeze CPPFLAGS
+       squeeze CFLAGS
+       CARES_COMPILER_WORKS_IFELSE([