From owner-svn-ports-all@FreeBSD.ORG Wed Mar 11 13:58:35 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2406C285; Wed, 11 Mar 2015 13:58:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FA08F27; Wed, 11 Mar 2015 13:58:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2BDwYiM019079; Wed, 11 Mar 2015 13:58:34 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2BDwYYN019078; Wed, 11 Mar 2015 13:58:34 GMT (envelope-from db@FreeBSD.org) Message-Id: <201503111358.t2BDwYYN019078@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Wed, 11 Mar 2015 13:58:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380983 - head/comms/gnuradio 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2015 13:58:35 -0000 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