[100089] trunk/dports/science/gnuradio/Portfile

michaelld at macports.org michaelld at macports.org
Tue Nov 27 08:04:48 PST 2012


Revision: 100089
          https://trac.macports.org/changeset/100089
Author:   michaelld at macports.org
Date:     2012-11-27 08:04:48 -0800 (Tue, 27 Nov 2012)
Log Message:
-----------
gnuradio: update devel and next to latest; force selection of Python variant, wit default to 2.7, since VOLK requires Cheetah.

Modified Paths:
--------------
    trunk/dports/science/gnuradio/Portfile

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2012-11-27 15:34:45 UTC (rev 100088)
+++ trunk/dports/science/gnuradio/Portfile	2012-11-27 16:04:48 UTC (rev 100089)
@@ -60,18 +60,14 @@
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT Master branch, which is typically updated every few days to week.  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.
 
-    version             3.6.3_20121119
+    version             3.6.3_20121124
 
     conflicts           gnuradio gnuradio-next
 
     fetch.type          git
     git.url             git://gnuradio.org/gnuradio.git
-    git.branch          afea463f079efe099a2228f0e60f4481e5edcd91
+    git.branch          2d1d05a8c4cd2f9597bcebe7f0801b5a8948aeab
 
-    if {${configure.compiler} == "clang"} {
-        patchfiles patch-clang.diff
-    }
-
     post-configure {
 
         # make sure the build depends on the local version of GRUEL,
@@ -93,13 +89,13 @@
     long_description    ${description}: \
         This port is kept up with the GNU Radio GIT Next branch, which is typically updated every few days to week.  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.
 
-    version             3.7.0_20121119
+    version             3.7.0_20121124
 
     conflicts           gnuradio gnuradio-devel
 
     fetch.type          git
     git.url             git://gnuradio.org/gnuradio.git
-    git.branch          c0b35b4ec7c95e9d0e91d91edb81d854db2b2b72
+    git.branch          4d957e4fb0fbe12e20c6890035f4b66b1a63115b
 
     post-configure {
 
@@ -131,6 +127,15 @@
 configure.dir       ${workpath}/build
 build.dir           ${workpath}/build
 
+# VOLK compiles best with GCC of some type;
+# print a warning if using clang
+
+pre-configure {
+    if {${configure.compiler} == "clang"} {
+        ui_msg "WARNING: GNU Radio's VOLK component compiles best when using GCC.  The selected compiler is CLANG, which will result in a fully functioning GNU Radio install but the VOLK component will not utilize the CPU's capabilities."
+    }
+}
+
 # always enable VOLK, with or without orc
 
 configure.args-append -DENABLE_VOLK=ON
@@ -172,11 +177,12 @@
 
             set chosen_python_suffix ${s}
 
-            # specify the Python dependency
+            # specify the Python dependencies
 
             depends_lib-append \
                 port:${p} \
-                port:py${s}-numpy
+                port:py${s}-numpy \
+                port:py${s}-cheetah
 
             # specify the Python version to use
 
@@ -200,7 +206,6 @@
             if {[variant_isset grc]} {
 
                 depends_lib-append \
-                    port:py${s}-cheetah \
                     port:py${s}-lxml \
                     port:py${s}-gtk
 
@@ -239,6 +244,19 @@
     }]
 }
 
+# Python is required; default to 2.7
+
+if {![variant_isset python26] && ![variant_isset python27]} {
+    default_variants +python27
+}
+
+# Make sure -python27 was not specified alone
+
+if {![variant_isset python26] && ![variant_isset python27]} {
+    ui_error "GNU Radio requires a Python to be selected; you cannot use -python27 as a variant alone."
+    return -code error "Invalid variant selection"
+}
+
 variant docs description "Install GNU Radio documentation" {
 
     depends_lib-append \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121127/56363d81/attachment.html>


More information about the macports-changes mailing list