From owner-svn-ports-head@freebsd.org Sun Dec 4 14:28:24 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19BEBC67040; Sun, 4 Dec 2016 14:28:24 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C33981726; Sun, 4 Dec 2016 14:28:23 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB4ESMkR040346; Sun, 4 Dec 2016 14:28:22 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB4ESM6Z040344; Sun, 4 Dec 2016 14:28:22 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201612041428.uB4ESM6Z040344@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 4 Dec 2016 14:28:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427791 - in head/databases/memcached: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Dec 2016 14:28:24 -0000 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`