[pkgsrc/trunk]: pkgsrc/devel/memcached Fix build with newer DTrace.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/18d571bde9ad
branches:  trunk
changeset: 648975:18d571bde9ad
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Mar 26 10:16:14 2015 +0000

description:
Fix build with newer DTrace.

diffstat:

 devel/memcached/distinfo                |   4 ++--
 devel/memcached/patches/patch-configure |  32 +++++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r c18714000908 -r 18d571bde9ad devel/memcached/distinfo
--- a/devel/memcached/distinfo  Thu Mar 26 10:08:25 2015 +0000
+++ b/devel/memcached/distinfo  Thu Mar 26 10:16:14 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2015/01/04 23:41:04 wiz Exp $
+$NetBSD: distinfo,v 1.22 2015/03/26 10:16:14 jperkin Exp $
 
 SHA1 (memcached-1.4.22.tar.gz) = 5968d357d504a1f52622f9f8a3e85c29558acaa5
 RMD160 (memcached-1.4.22.tar.gz) = 2cde1cec77d312a118fbb74514021e95a3a84395
@@ -7,4 +7,4 @@
 SHA1 (patch-Makefile.in) = e71671670abd24440fc9ce783b0c6be8adf6c27c
 SHA1 (patch-aa) = 43803d05d1da91440f6619b321c3e1ff4fcb8e2f
 SHA1 (patch-ab) = a870c803752bca12550da73d19ee0e675b5e576d
-SHA1 (patch-configure) = 2e283a79362edc90d08c73edece4a9ec8df51e6e
+SHA1 (patch-configure) = d44e07c0c38029df4f10bb5411049595b5a8ffbb
diff -r c18714000908 -r 18d571bde9ad devel/memcached/patches/patch-configure
--- a/devel/memcached/patches/patch-configure   Thu Mar 26 10:08:25 2015 +0000
+++ b/devel/memcached/patches/patch-configure   Thu Mar 26 10:16:14 2015 +0000
@@ -1,11 +1,37 @@
-$NetBSD: patch-configure,v 1.3 2014/04/25 09:27:37 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2015/03/26 10:16:14 jperkin Exp $
 
 Remove -Werror from default flags since different compilers
 have very different warnings.
 
---- configure.orig     2012-02-25 19:58:48.000000000 +0000
+Ensure DTrace tests include valid probes.
+
+--- configure.orig     2015-01-01 07:53:30.000000000 +0000
 +++ configure
-@@ -6261,7 +6261,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confd
+@@ -4918,13 +4918,21 @@ fi
+ $as_echo "#define ENABLE_DTRACE 1" >>confdefs.h
+ 
+     build_dtrace=yes
++    $as_echo "provider conftest { probe fire(); };" >conftest_provider.d
++    $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null
++    cat <<_ACEOF >conftest.$ac_ext
++#include "conftest_provider.h"
++int main (void) { CONFTEST_FIRE(); return 0; }
++_ACEOF
++    ac_fn_c_try_compile "$LINENO"
+     # DTrace on MacOSX does not use -G option
+-    $DTRACE -G -o conftest.$$ -s memcached_dtrace.d 2>/dev/zero
++    $DTRACE -G -o conftest.$$ -s conftest_provider.d conftest.$ac_objext 2>/dev/null
+     if test $? -eq 0
+     then
+         dtrace_instrument_obj=yes
+-        rm conftest.$$
+     fi
++    rm -f core conftest.err conftest.$ac_objext \
++        conftest$ac_exeext conftest.$ac_ext conftest.$$
+ 
+     if test "`which tr`" = "/usr/ucb/tr"; then
+         as_fn_error $? "Please remove /usr/ucb from your path. See man standards for more info" "$LINENO" 5
+@@ -6435,7 +6443,7 @@ $as_echo "#define _GNU_SOURCE 1" >>confd
  elif test "$GCC" = "yes"
  then
    GCC_VERSION=`$CC -dumpversion`