Changeset 113561

Timestamp:

Nov 19, 2013, 9:07:33 PM (10 years ago)

Author:

michaelld@…

Message:

gnuradio:
+ update devel to d04a3d34 and next to 1ee761de, both 20131118;
+ fix legacy build on 10.9;
+ patch to check for AVX correctly: both xgetbv and cvtpi32_ps;
+ remove +full from prior installs when updating;
+ remove blacklisting, since all compilers now seem to work;
+ hopefully addresses ticket #41162.

Location:

trunk/dports/science/gnuradio

Files:

• Portfile (modified) (11 diffs)
• files/patch-gnuradio-core_swig_include-std_string.i.diff (added)
• files/patch-gnuradio-core_swig_std_std_container.i.diff (added)
• files/patch-gnuradio-runtime_swig_include-std_string.i.diff (moved) (moved from trunk/dports/science/gnuradio/files/patch-swig-include-std_string.i.diff)
• files/patch-path-order.diff (modified) (3 diffs)
• files/patch-volk_gen_archs.xml.legacy.diff (added)
• files/patch-volk_lib_CMakeLists.txt.diff (added)
• files/patch-volk_lib_CMakeLists.txt.legacy.diff (added)

trunk/dports/science/gnuradio/Portfile

@@ -6 +6 @@
 PortGroup           wxWidgets 1.0
 PortGroup           active_variants 1.1
-PortGroup           compiler_blacklist_versions 1.0
 
 wxWidgets.use       wxPython-3.0
@@ -39 +38 @@
         sha256  b80b42eaa091cb77a168e15b029307856db249d460ff06dfdf292802c19a2669
 
-    # patch for fix swig build on 10.9; tested on 10.8
-    # and does not seem to hurt.
-
-    patchfiles-append patch-swig-include-std_string.i.diff
-
     livecheck.url   http://gnuradio.org/releases/gnuradio/?C=M&O=D
     livecheck.regex >LATEST-IS-(\[^<\]*)<
@@ -52 +46 @@
 
     version         3.6.5.1
-    revision        3
+    revision        4
 
     long_description    ${description}: \
@@ -67 +61 @@
         sha256  0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621
 
-    patchfiles      patch-path-order.diff
-    patch.pre_args  -p1
+    # fix INCLUDE_DIRECTORIES path order such that internal
+    # directories are searched before ${prefix}/include or system
+    # ones.
+
+    patchfiles-append patch-path-order.diff
+
+    # add checks for xgetbv instruction and cvtpi32_ps intrinsic
+
+    patchfiles-append patch-volk_lib_CMakeLists.txt.legacy.diff
+
+    # fix VOLK arch generators to include clang
+
+    patchfiles-append patch-volk_gen_archs.xml.legacy.diff
+
+    # 3.6.5.1 is the last of the 3.6 API development
 
     livecheck.type  none
@@ -79 +86 @@
         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.3_20131114
+    version             3.7.3_20131118
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
@@ -85 +92 @@
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          3b27cc47e134e0ea33c1856d1afd6e87931607c9
+    git.branch          d04a3d340145ed14a64cf1e0e0615cab806ab357
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
@@ -98 +105 @@
         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_20131114
+    version             3.8.0_20131118
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
@@ -104 +111 @@
     fetch.type          git
     git.url             http://git.gnuradio.org/git/gnuradio.git
-    git.branch          54d3961bdaaa708152e33264b95759bab4d94c87
+    git.branch          1ee761deea4b8b6ce2c503e080243ab20e90a80d
 
     livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
@@ -132 +139 @@
     }
 
-    # GNU Radio 3.7.1+ works with Apple GCC, some Apple clang >=
-    # 500.2.79, and MacPorts clang 3.4 or newer; blacklist other
-    # compilers.
-
-    if {${os.major} == 13} {
-        # works with Apple's clang 500.2.79 on 10.9, but not 10.8.
-        compiler.blacklist-append { clang < 500.2.79 }
-    } else {
-        compiler.blacklist-append clang
-    }
-
-    compiler.blacklist-append \
-        macports-clang-2.9 macports-clang-3.1 \
-        macports-clang-3.2 macports-clang-3.3
-
-
-} 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-append *clang* macports*
-
-}
-
-compiler.blacklist-append dragonegg*
+    # add check for cvtpi32_ps intrinsic
+
+    patchfiles-append patch-volk_lib_CMakeLists.txt.diff
+
+}
 
 use_parallel_build  yes
@@ -181 +166 @@
 platform darwin 13 {
     pre-patch {
-        set std_dest_dir ${worksrcpath}/gnuradio-runtime/swig/std
-        if {[file exists ${std_dest_dir}]} {
-            delete ${std_dest_dir}
+        if {${subport} eq "gnuradio-legacy"} {
+            # legacy has a different directory structure
+            set std_dest_dir ${worksrcpath}/gnuradio-core/src/lib/swig/std
+            if {[file exists ${std_dest_dir}]} {
+                delete ${std_dest_dir}
+            }
+            copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir}
+            patchfiles-append \
+                patch-gnuradio-core_swig_std_std_container.i.diff \
+                patch-gnuradio-core_swig_include-std_string.i.diff
+        } else {
+            set std_dest_dir ${worksrcpath}/gnuradio-runtime/swig/std
+            if {[file exists ${std_dest_dir}]} {
+                delete ${std_dest_dir}
+            }
+            copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir}
+            patchfiles-append \
+                patch-gnuradio-runtime_swig_std_std_container.i.diff
+            if {${subport} eq "gnuradio"} {
+                # patch for fix swig build on 10.9; tested on 10.8
+                # and does not seem to hurt.  This patch is already
+                # integrated upstream.
+                patchfiles-append \
+                    patch-gnuradio-runtime_swig_std_std_container.i.diff
+            }
         }
-        copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir}
     }
-    patchfiles-append patch-gnuradio-runtime_swig_std_std_container.i.diff
 }
 
@@ -235 +240 @@
 
 variant full description {Deprecated legacy variant} {}
+default_variants -full
 
 # per user concensus: enable all variants except +debug and +universal

trunk/dports/science/gnuradio/files/patch-path-order.diff

@@ -1 @@
-diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
-index b9bf0bb..eb2dce3 100644
---- a/cmake/Modules/GrSwig.cmake
-+++ b/cmake/Modules/GrSwig.cmake
+--- cmake/Modules/GrSwig.cmake.orig
++++ cmake/Modules/GrSwig.cmake
 @@ -118,8 +118,8 @@ macro(GR_SWIG_MAKE name)
      find_package(PythonLibs)
@@ -14 +12 @@
      #determine include dependencies for swig file
      execute_process(
-diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
-index c9e2806..48f4445 100644
---- a/gr-audio/lib/CMakeLists.txt
-+++ b/gr-audio/lib/CMakeLists.txt
+--- gr-audio/lib/CMakeLists.txt.orig
++++ gr-audio/lib/CMakeLists.txt
 @@ -20,18 +20,6 @@
  ########################################################################
@@ -125 +121 @@
  target_link_libraries(gnuradio-audio ${gr_audio_libs})
  GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
-diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt
-index 3e8c516..627135a 100644
---- a/gruel/CMakeLists.txt
-+++ b/gruel/CMakeLists.txt
+--- gruel/CMakeLists.txt.orig
++++ gruel/CMakeLists.txt
 @@ -37,7 +37,6 @@ include(GrMiscUtils)
  GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS