svn commit: r305851 - head/lang/hiphop-php

Gerald Pfeifer gerald at FreeBSD.org
Sat Oct 13 23:19:37 UTC 2012


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}


More information about the svn-ports-head mailing list