svn commit: r309337 - in head/net-p2p: eiskaltdcpp-daemon eiskaltdcpp-gtk eiskaltdcpp-lib eiskaltdcpp-qt
Gerald Pfeifer
gerald at FreeBSD.org
Fri Dec 21 04:05:16 UTC 2012
Author: gerald
Date: Fri Dec 21 04:05:15 2012
New Revision: 309337
URL: http://svnweb.freebsd.org/changeset/ports/309337
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.
As a side effect, the Makefiles become a tad simpler. On the way,
update to USE_GCC=4.6+ per pending work of linimon and myself.
Approved by: maintainer
Modified:
head/net-p2p/eiskaltdcpp-daemon/Makefile
head/net-p2p/eiskaltdcpp-gtk/Makefile
head/net-p2p/eiskaltdcpp-lib/Makefile
head/net-p2p/eiskaltdcpp-qt/Makefile
Modified: head/net-p2p/eiskaltdcpp-daemon/Makefile
==============================================================================
--- head/net-p2p/eiskaltdcpp-daemon/Makefile Fri Dec 21 02:35:34 2012 (r309336)
+++ head/net-p2p/eiskaltdcpp-daemon/Makefile Fri Dec 21 04:05:15 2012 (r309337)
@@ -25,7 +25,7 @@ BROKEN= does not link
PROJECTHOST= eiskaltdc
USE_XZ= yes
-USE_GCC= 4.4+
+USE_GCC= 4.6+
USE_GETTEXT= yes
USE_CMAKE= yes
USE_OPENSSL= yes
@@ -67,9 +67,7 @@ CMAKE_ARGS+= -DXMLRPC_DAEMON:BOOL=OFF
USE_OPENSSL_PORT=yes
.endif
-GCC_LIBS= "${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}"
-
post-build:
- ${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/nasdc/${PORTNAME}"
+ ${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/nasdc/${PORTNAME}"
.include <bsd.port.post.mk>
Modified: head/net-p2p/eiskaltdcpp-gtk/Makefile
==============================================================================
--- head/net-p2p/eiskaltdcpp-gtk/Makefile Fri Dec 21 02:35:34 2012 (r309336)
+++ head/net-p2p/eiskaltdcpp-gtk/Makefile Fri Dec 21 04:05:15 2012 (r309337)
@@ -25,7 +25,7 @@ CMAKE_ARGS+= -DBUILD_LIB:BOOL=OFF
PROJECTHOST= eiskaltdc
USE_XZ= yes
-USE_GCC= 4.4+
+USE_GCC= 4.6+
USE_CMAKE= yes
USE_GETTEXT= yes
USE_OPENSSL= yes
@@ -75,9 +75,7 @@ CMAKE_ARGS+= -DUSE_LIBNOTIFY:BOOL=OFF
USE_OPENSSL_PORT=yes
.endif
-GCC_LIBS= "${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}"
-
post-build:
- ${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/${PORTNAME}/${PORTNAME}"
+ ${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/${PORTNAME}/${PORTNAME}"
.include <bsd.port.mk>
Modified: head/net-p2p/eiskaltdcpp-lib/Makefile
==============================================================================
--- head/net-p2p/eiskaltdcpp-lib/Makefile Fri Dec 21 02:35:34 2012 (r309336)
+++ head/net-p2p/eiskaltdcpp-lib/Makefile Fri Dec 21 04:05:15 2012 (r309337)
@@ -23,7 +23,7 @@ BUILD_DEPENDS+= chrpath:${PORTSDIR}/deve
PROJECTHOST= eiskaltdc
USE_XZ= yes
-USE_GCC= 4.4+
+USE_GCC= 4.6+
USE_CMAKE= yes
USE_GETTEXT= yes
USE_OPENSSL= yes
@@ -78,9 +78,7 @@ CMAKE_ARGS+= -DWITH_DHT:BOOL=OFF
USE_OPENSSL_PORT=yes
.endif
-GCC_LIBS= "${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}"
-
post-build:
- ${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/dcpp/libeiskaltdcpp.so.2.2"
+ ${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/dcpp/libeiskaltdcpp.so.2.2"
.include <bsd.port.post.mk>
Modified: head/net-p2p/eiskaltdcpp-qt/Makefile
==============================================================================
--- head/net-p2p/eiskaltdcpp-qt/Makefile Fri Dec 21 02:35:34 2012 (r309336)
+++ head/net-p2p/eiskaltdcpp-qt/Makefile Fri Dec 21 04:05:15 2012 (r309337)
@@ -28,7 +28,7 @@ CMAKE_ARGS+= -DBUILD_LIB:BOOL=OFF
PROJECTHOST= eiskaltdc
USE_XZ= yes
-USE_GCC= 4.4+
+USE_GCC= 4.6+
USE_GETTEXT= yes
USE_CMAKE= yes
USE_OPENSSL= yes
@@ -116,9 +116,7 @@ CMAKE_ARGS+= -DUSE_MINIUPNP:BOOL=OFF
USE_OPENSSL_PORT=yes
.endif
-GCC_LIBS= "${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}"
-
post-build:
- ${LOCALBASE}/bin/chrpath -r "${GCC_LIBS}" "${WRKSRC}/${PORTNAME}/${PORTNAME}"
+ ${LOCALBASE}/bin/chrpath -r "${_GCC_RUNTIME}" "${WRKSRC}/${PORTNAME}/${PORTNAME}"
.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list