Revision: 110365 https://trac.macports.org/changeset/110365 Author: michaelld@macports.org Date: 2013-08-30 11:08:37 -0700 (Fri, 30 Aug 2013) Log Message: ----------- gnuradio: * fix compiler blacklists and comments; * update releasse to 3.7.1; * update devel to d19aa281 and next to 880d0392 (both 20130829). Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2013-08-30 18:04:31 UTC (rev 110364) +++ trunk/dports/science/gnuradio/Portfile 2013-08-30 18:08:37 UTC (rev 110365) @@ -22,8 +22,7 @@ if {${subport} == ${name}} { - version 3.7.0 - revision 2 + version 3.7.1 long_description ${description}: \ This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months. @@ -35,8 +34,8 @@ master_sites http://gnuradio.org/releases/gnuradio gnu checksums \ - rmd160 6b899929b072edf6c3784efbff5836531c558f6a \ - sha256 c18e12f119df5ea49ea2ed8ccde3b13043d9c4adfbbb28ac3f15122c91e646a5 + rmd160 c3c346d5d9a9b6d91f30b4b5d56737dcb9f41125 \ + sha256 e9f7f66d175365e281175f889ed4fc46e20318affa8f1f5b4edbe477378ad6cd livecheck.url http://gnuradio.org/releases/gnuradio/?C=M&O=D livecheck.regex >LATEST-IS-(\[^<\]*)< @@ -73,13 +72,13 @@ long_description ${description}: \ This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again. - version 3.7.1_20130828 + version 3.7.2_20130829 conflicts gnuradio-legacy gnuradio gnuradio-next fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch 55f637b609d676c7189dbf7c939a1284225768e9 + git.branch d19aa281291a4cb45b3c30cdaafcea9eee5d1887 livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=master livecheck.version ${git.branch} @@ -92,13 +91,13 @@ long_description ${description}: \ This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again. - version 3.8.0_20130828 + version 3.8.0_20130829 conflicts gnuradio-legacy gnuradio gnuradio-devel fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch efed905156813b47dfdf486bdbe312fea6b2da71 + git.branch 880d0392c2371cf1b67ec1481978e8f9e1cae9c6 livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=next livecheck.version ${git.branch} @@ -125,6 +124,21 @@ configure.args-append -DENABLE_GR_CTRLPORT=OFF } + + # VOLK requires a GCC variant (Apple or MacPorts), for now; + # blacklist all clang variants, for now. + # http://trac.macports.org/ticket/37979 + + compiler.blacklist *clang* + +} else { + + # legacy works with Apple GCC only, because the cmake build script + # does not robustly check for the xgetbv instruction; a fix for + # this issue is in release 3.7.1 and newer. + + compiler.blacklist *clang* macports* dragonegg* + } use_parallel_build yes @@ -142,11 +156,6 @@ configure.dir ${vpath} build.dir ${vpath} -# VOLK requires an Apple GCC variant (including the ones from -# MacPorts), for now; blacklist all others, for now. -# http://trac.macports.org/ticket/37979 -compiler.blacklist *clang* macports-gcc* dragonegg* - # let CMake figure out some flags configure.ldflags