svn commit: r396889 - head/comms/gnuradio
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Sep 14 11:16:57 UTC 2015
Author: amdmi3
Date: Mon Sep 14 11:16:55 2015
New Revision: 396889
URL: https://svnweb.freebsd.org/changeset/ports/396889
Log:
- Fix build on 10.x: you can't use gcc when boost is built with clang; and it builds with clang just fine
Approved by: portmgr blanket
Modified:
head/comms/gnuradio/Makefile
Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile Mon Sep 14 11:16:13 2015 (r396888)
+++ head/comms/gnuradio/Makefile Mon Sep 14 11:16:55 2015 (r396889)
@@ -36,7 +36,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= cmake:outsource iconv perl5 python:2.7 shebangfix
SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in
-CONFIGURE_ENV+= LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1"
CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
CMAKE_ARGS+= -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
-DICONV_LIB:STRING="X${ICONV_LIB}" \
@@ -46,7 +45,6 @@ CMAKE_ARGS+= -DICONV_PREFIX:STRING="${IC
MAJOR_SUB_VER= 3.7.7
DOCSDIR= share/doc/${PORTNAME}-${MAJOR_SUB_VER}
USE_GNOME= pygtk2
-USE_GCC= yes
USE_WX= 3.0+
USE_QT4= gui xml qmake moc rcc uic
WX_COMPS= wx wx:build wx:run python:build python:run
@@ -64,8 +62,6 @@ USRP_DESC= Include USRP support (UHD) fr
TESTING_DESC= Include testing support
PLIST_SUB+= PORTVERSION=${PORTVERSION}
-VP= ${GCC_DEFAULT:S/.//}
-GCC_LIBS= ${LOCALBASE}/lib/gcc${VP}
DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \
${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \
@@ -88,6 +84,12 @@ TESTING_CMAKE_ON= -DENABLE_TESTING:STRIN
TESTING_CMAKE_OFF= -DENABLE_TESTING:STRING="OFF"
TESTING_BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+USE_GCC= yes
+.endif
+
post-patch:
@${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
${XARGS} ${REINPLACE_CMD} -e \
More information about the svn-ports-head
mailing list