diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-03-26 10:16:14 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-03-26 10:16:14 +0000 |
| commit | 22f54b5d05c17e6ca18c578470db1cd5ba1e297c (patch) | |
| tree | 08fe1bb6e21ea2eba5a586c26ac937cebb3372bc | |
| parent | 10597f7f2e26568837e52f10bb64980e0cfd5b64 (diff) | |
| download | pkgsrc-22f54b5d05c17e6ca18c578470db1cd5ba1e297c.tar.gz | |
Fix build with newer DTrace.
| -rw-r--r-- | devel/memcached/distinfo | 4 | ||||
| -rw-r--r-- | devel/memcached/patches/patch-configure | 32 |
2 files changed, 31 insertions, 5 deletions
diff --git a/devel/memcached/distinfo b/devel/memcached/distinfo index 1fd1eafaafd..6516bcd6a38 100644 --- a/devel/memcached/distinfo +++ b/devel/memcached/distinfo @@ -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.am) = c8e6c2f4c7ce8264c2b4dcad6445248264a8fa9e SHA1 (patch-Makefile.in) = e71671670abd24440fc9ce783b0c6be8adf6c27c SHA1 (patch-aa) = 43803d05d1da91440f6619b321c3e1ff4fcb8e2f SHA1 (patch-ab) = a870c803752bca12550da73d19ee0e675b5e576d -SHA1 (patch-configure) = 2e283a79362edc90d08c73edece4a9ec8df51e6e +SHA1 (patch-configure) = d44e07c0c38029df4f10bb5411049595b5a8ffbb diff --git a/devel/memcached/patches/patch-configure b/devel/memcached/patches/patch-configure index cb5ba3dd8fa..0f6e0d10512 100644 --- a/devel/memcached/patches/patch-configure +++ b/devel/memcached/patches/patch-configure @@ -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` |