Date: Wed, 11 Mar 2015 13:58:34 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380983 - head/comms/gnuradio Message-ID: <201503111358.t2BDwYYN019078@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Wed Mar 11 13:58:34 2015 New Revision: 380983 URL: https://svnweb.freebsd.org/changeset/ports/380983 QAT: https://qat.redports.org/buildarchive/r380983/ Log: Finally unbreak the build by preloading GCC_DEFAULT libs paths. It is complicated by the intermix of gcc and gfortran libs being intermixed with system libs. Especially by dynamically loaded modules into python being linked against gfortran or current gcc. I realise using GCC_DEFAULT lib paths is not a general solution. Modified: head/comms/gnuradio/Makefile Modified: head/comms/gnuradio/Makefile ============================================================================== --- head/comms/gnuradio/Makefile Wed Mar 11 13:49:01 2015 (r380982) +++ head/comms/gnuradio/Makefile Wed Mar 11 13:58:34 2015 (r380983) @@ -38,6 +38,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= iconv cmake:outsource perl5 python:2.7 shebangfix SHEBANG_FILES= grc/freedesktop/grc_setup_freedesktop.in +CMAKE_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}" \ @@ -62,6 +63,8 @@ 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} .include <bsd.port.pre.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503111358.t2BDwYYN019078>