From owner-svn-ports-all@FreeBSD.ORG  Sat Oct 13 23:19:37 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 389909FD;
 Sat, 13 Oct 2012 23:19:37 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 206E98FC08;
 Sat, 13 Oct 2012 23:19:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9DNJakI029448;
 Sat, 13 Oct 2012 23:19:36 GMT (envelope-from gerald@svn.freebsd.org)
Received: (from gerald@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9DNJaBt029446;
 Sat, 13 Oct 2012 23:19:36 GMT (envelope-from gerald@svn.freebsd.org)
Message-Id: <201210132319.q9DNJaBt029446@svn.freebsd.org>
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sat, 13 Oct 2012 23:19:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305851 - head/lang/hiphop-php
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.14
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: Sat, 13 Oct 2012 23:19:37 -0000

Author: gerald
Date: Sat Oct 13 23:19:36 2012
New Revision: 305851
URL: http://svn.freebsd.org/changeset/ports/305851

Log:
  Replace the use of _GCC_BUILD_DEPENDS (which was never meant to be
  used outside of Mk/bsd.gcc.mk) by _GCC_RUNTIME.  This is still not
  ideal, but at least a documented stopgap, and it avoids the manual
  construction of the directory to be added to rpath.
  
  Remove -rpath= from _CFLAGS and _LDFLAGS since CFLAGS and LDFLAGS
  already have -Wl,-rpath= (and -rpath= itself is not even accepted
  by current versions of GCC).
  
  Approved by:	maintainer timeout (6 weeks)
  Feature safe:	yes

Modified:
  head/lang/hiphop-php/Makefile

Modified: head/lang/hiphop-php/Makefile
==============================================================================
--- head/lang/hiphop-php/Makefile	Sat Oct 13 20:37:03 2012	(r305850)
+++ head/lang/hiphop-php/Makefile	Sat Oct 13 23:19:36 2012	(r305851)
@@ -119,12 +119,9 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-
 
 .include <bsd.port.pre.mk>
 
-_CFLAGS=	-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS} \
-		${CFLAGS}
-_CXXFLAGS=	-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS} \
-		${CXXFLAGS}
-_LDFLAGS=	-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS} \
-		${LDFLAGS}
+_CFLAGS=	${CFLAGS}
+_CXXFLAGS=	-rpath=${_GCC_RUNTIME} ${CXXFLAGS}
+_LDFLAGS=	${LDFLAGS}
 
 CONFIGURE_ENV+=	${CUSTOM_ENV}
 MAKE_ENV+=	${CUSTOM_ENV}