From owner-svn-ports-all@FreeBSD.ORG  Wed Jan 15 22:07:45 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5738419D;
 Wed, 15 Jan 2014 22:07:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 289491A8A;
 Wed, 15 Jan 2014 22:07:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0FM7iOY048854;
 Wed, 15 Jan 2014 22:07:44 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0FM7iXh048853;
 Wed, 15 Jan 2014 22:07:44 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201401152207.s0FM7iXh048853@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Wed, 15 Jan 2014 22:07:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339826 - head/devel/google-perftools
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jan 2014 22:07:45 -0000

Author: mandree
Date: Wed Jan 15 22:07:44 2014
New Revision: 339826
URL: http://svnweb.freebsd.org/changeset/ports/339826
QAT: https://qat.redports.org/buildarchive/r339826/

Log:
  Revert USE_GCC addition, and for clang, set -fno-builtin, and strip the
  GCC-specific -fno-builtin-<FUNCTION> arguments.
  
  Now has two failures on 10.0-RC5 and three on 9.2-RELEASE-p3 (both
  amd64) with the respective default compiler.

Modified:
  head/devel/google-perftools/Makefile

Modified: head/devel/google-perftools/Makefile
==============================================================================
--- head/devel/google-perftools/Makefile	Wed Jan 15 21:41:15 2014	(r339825)
+++ head/devel/google-perftools/Makefile	Wed Jan 15 22:07:44 2014	(r339826)
@@ -3,6 +3,7 @@
 
 PORTNAME=	google-perftools
 PORTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL}
@@ -24,14 +25,34 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/exe
 LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
 GNU_CONFIGURE=	yes
-USE_GCC=	any # clang causes 7 more test case failures in "make check"
 USE_LDCONFIG=	yes
+USES=		compiler
 
-CONFIGURE_ARGS+=CPPFLAGS=-I${LOCALBASE}/include LIBS=-lexecinfo LDFLAGS=-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-lexecinfo
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=LIBS="${LIBS}"
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
+
+.if ${COMPILER_TYPE} == "clang" && !defined(USE_GCC)
+# clang cannot disable builtins individually
+CXXFLAGS+=	-fno-builtin
+.endif
+
+.if ${ARCH} == "amd64"
+CONFIGURE_ARGS+=--enable-frame-pointers
+.endif
+.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+BROKEN=	Does not build, assembly not supported, see PR-94: http://code.google.com/p/google-perftools/issues/detail?id=94&can=1
+.endif
 
 post-patch:
+.if ${COMPILER_TYPE} == "clang" && !defined(USE_GCC)
+	${REINPLACE_CMD} -Ee \
+		's|-fno-builtin-[a-z_]+||g' \
+		${WRKSRC}/Makefile.in
+.endif
 .if empty(PORT_OPTIONS:MDOCS)
 	${REINPLACE_CMD} -e \
 		'/^install-data-am:/ s|install-dist_docDATA||' \
@@ -54,13 +75,4 @@ post-install:
 check: build
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CONFIGURE_ARGS+=--enable-frame-pointers
-.endif
-.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
-BROKEN=	Does not build, assembly not supported, see PR-94: http://code.google.com/p/google-perftools/issues/detail?id=94&can=1
-.endif
-
 .include <bsd.port.post.mk>