Date: Sun, 4 Dec 2016 14:28:22 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427791 - in head/databases/memcached: . files Message-ID: <201612041428.uB4ESM6Z040344@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sun Dec 4 14:28:22 2016 New Revision: 427791 URL: https://svnweb.freebsd.org/changeset/ports/427791 Log: databases/memcached: fix and enable DTrace option Modified: head/databases/memcached/Makefile head/databases/memcached/files/patch-configure.ac Modified: head/databases/memcached/Makefile ============================================================================== --- head/databases/memcached/Makefile Sun Dec 4 14:24:14 2016 (r427790) +++ head/databases/memcached/Makefile Sun Dec 4 14:28:22 2016 (r427791) @@ -3,6 +3,7 @@ PORTNAME= memcached PORTVERSION= 1.4.33 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.memcached.org/files/ \ GENTOO @@ -19,7 +20,16 @@ CONFLICTS= memcached-1.2* # Dtrace option disabled until it is fixed upstream OPTIONS_DEFINE= SASL DOCS DTRACE -OPTIONS_DEFAULT= SASL +OPTIONS_DEFAULT= SASL DTRACE + +.if !exists(/usr/sbin/dtrace) +OPTIONS_EXCLUDE+= DTRACE +.endif + +OPTIONS_EXCLUDE_FreeBSD_9+= DTRACE +OPTIONS_EXCLUDE_FreeBSD_10+= DTRACE +OPTIONS_EXCLUDE+= ${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}} +OPTIONS_EXCLUDE_i386= DTRACE DTRACE_DESC= Enable dtrace probes SASL_DESC= Enable SASL Authentication @@ -55,8 +65,9 @@ MAKE_JOBS_UNSAFE= yes CONFIGURE_ARGS+= --enable-64bit .endif +# avoid triggering a bug in libdtrace, see illumos issue 6653 .if ${PORT_OPTIONS:MDTRACE} -BROKEN= DTRACE broken with gcc/clang - reported upstream +CFLAGS+= -no-integrated-as .endif post-install: Modified: head/databases/memcached/files/patch-configure.ac ============================================================================== --- head/databases/memcached/files/patch-configure.ac Sun Dec 4 14:24:14 2016 (r427790) +++ head/databases/memcached/files/patch-configure.ac Sun Dec 4 14:28:22 2016 (r427791) @@ -1,6 +1,16 @@ ---- configure.ac.orig 2015-06-27 18:28:54 UTC +--- configure.ac.orig 2016-12-04 13:19:07 UTC +++ configure.ac -@@ -581,7 +581,7 @@ then +@@ -137,8 +137,7 @@ if test "x$enable_dtrace" = "xyes"; then + if test "x$DTRACE" != "xno"; then + AC_DEFINE([ENABLE_DTRACE],1,[Set to nonzero if you want to include DTRACE]) + build_dtrace=yes +- # DTrace on MacOSX does not use -G option +- $DTRACE -G -o conftest.$$ -s memcached_dtrace.d 2>/dev/zero ++ /usr/bin/true + if test $? -eq 0 + then + dtrace_instrument_obj=yes +@@ -594,7 +593,7 @@ then elif test "$GCC" = "yes" then GCC_VERSION=`$CC -dumpversion`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612041428.uB4ESM6Z040344>