Changeset 113092

Timestamp:

Nov 8, 2013, 5:50:28 PM (10 years ago)

Author:

michaelld@…

Message:

gnuradio:
+ update devel to 5997f309 and next to 7c652f08, both 20131107;
+ support 10.9 except for SWIG Python interface;
+ still requires Python and some Python ports;
+ partly addresses ticket #41162.

File:

• trunk/dports/science/gnuradio/Portfile (modified) (8 diffs)

trunk/dports/science/gnuradio/Portfile

@@ -21 +21 @@
 dist_subdir         gnuradio
 
-# TODO: Support Mavericks once this port builds with clang++
 platform darwin {
     if {${os.major} >= 13} {
-        depends_lib
-        depends_run
         pre-fetch {
-            ui_error "$name does not build on Mavericks or later."
-            error "unsupported platform"
+            ui_msg "SWIG (as of 2.0.10) does not generate the C++11 compliant code needed by GNU Radio, and hence $name cannot use SWIG to build on Mavericks or later.  This means the GNU Radio Python interface cannot be created, and that gnuradio-companion will not be installed."
         }
     }
@@ -86 +82 @@
         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.2_20131106
+    version             3.7.2_20131107
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
@@ -92 +88 @@
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          5f724cfd76ad52288db91b535b4366c176717d29
+    git.branch          5997f309e8209219851bb62b7e76184395b8630b
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
@@ -105 +101 @@
         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_20131106
+    version             3.8.0_20131107
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
@@ -111 +107 @@
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          66e4d1aa42d1458b535d13162b4b57b0653b9136
+    git.branch          7c652f08b06497a50836b3be92bddb0c314bc803
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
@@ -139 +135 @@
     }
 
-    # 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*
-
+    platform darwin {
+        if {${os.major} < 13} {
+
+            # 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 {
 
@@ -495 +495 @@
 }
 
+# disable SWIG (and GRC) on 10.9 until SWIG works better
+
+platform darwin {
+    if {${os.major} >= 13} {
+
+        default_variants -swig -grc
+
+        if {[variant_isset swig] || [variant_isset grc]} {
+
+            ui_error "SWIG does not generate the C++11 compliant code needed by GNU Radio, and hence $name cannot use SWIG to build on Mavericks or later.  This means the GNU Radio Python interface cannot be created, and that gnuradio-companion will not be installed."
+            error "unsupported platform"
+
+        }
+    }
+}
+
 if {![variant_isset swig]} {
 
@@ -525 +541 @@
 # shortcut to installing all variants except Python
 
-variant full \
-    requires docs grc qtgui wxgui uhd orc wavelet jack portaudio swig sdl \
-    description {Enable all variants except +debug and +universal (and, for next, except +ctrlport)} {}
-
+platform darwin {
+    if {${os.major} >= 13} {
+
+        variant full \
+            requires docs qtgui wxgui uhd orc wavelet jack portaudio sdl \
+            description {Enable all variants except +debug and +universal (and, for next, except +ctrlport)} {}
+
+    } else {
+
+        variant full \
+            requires docs grc qtgui wxgui uhd orc wavelet jack portaudio swig sdl \
+            description {Enable all variants except +debug and +universal (and, for next, except +ctrlport)} {}
+
+    }
+}
 # make +full the default; per user concensus