Changeset 113561


Ignore:
Timestamp:
Nov 19, 2013, 9:07:33 PM (4 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:
5 added
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/gnuradio/Portfile

    r113407 r113561  
    66PortGroup           wxWidgets 1.0
    77PortGroup           active_variants 1.1
    8 PortGroup           compiler_blacklist_versions 1.0
    98
    109wxWidgets.use       wxPython-3.0
     
    3938        sha256  b80b42eaa091cb77a168e15b029307856db249d460ff06dfdf292802c19a2669
    4039
    41     # patch for fix swig build on 10.9; tested on 10.8
    42     # and does not seem to hurt.
    43 
    44     patchfiles-append patch-swig-include-std_string.i.diff
    45 
    4640    livecheck.url   http://gnuradio.org/releases/gnuradio/?C=M&O=D
    4741    livecheck.regex >LATEST-IS-(\[^<\]*)<
     
    5246
    5347    version         3.6.5.1
    54     revision        3
     48    revision        4
    5549
    5650    long_description    ${description}: \
     
    6761        sha256  0875d2f0a7da0f3bcc1771b528b0f98f79d9ab69aa1ef953651bbbe1f57b4621
    6862
    69     patchfiles      patch-path-order.diff
    70     patch.pre_args  -p1
     63    # fix INCLUDE_DIRECTORIES path order such that internal
     64    # directories are searched before ${prefix}/include or system
     65    # ones.
     66
     67    patchfiles-append patch-path-order.diff
     68
     69    # add checks for xgetbv instruction and cvtpi32_ps intrinsic
     70
     71    patchfiles-append patch-volk_lib_CMakeLists.txt.legacy.diff
     72
     73    # fix VOLK arch generators to include clang
     74
     75    patchfiles-append patch-volk_gen_archs.xml.legacy.diff
     76
     77    # 3.6.5.1 is the last of the 3.6 API development
    7178
    7279    livecheck.type  none
     
    7986        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.
    8087
    81     version             3.7.3_20131114
     88    version             3.7.3_20131118
    8289
    8390    conflicts           gnuradio-legacy gnuradio gnuradio-next
     
    8592    fetch.type          git
    8693    git.url             http://git.gnuradio.org/git/gnuradio.git
    87     git.branch          3b27cc47e134e0ea33c1856d1afd6e87931607c9
     94    git.branch          d04a3d340145ed14a64cf1e0e0615cab806ab357
    8895
    8996    livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
     
    98105        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.
    99106
    100     version             3.8.0_20131114
     107    version             3.8.0_20131118
    101108
    102109    conflicts           gnuradio-legacy gnuradio gnuradio-devel
     
    104111    fetch.type          git
    105112    git.url             http://git.gnuradio.org/git/gnuradio.git
    106     git.branch          54d3961bdaaa708152e33264b95759bab4d94c87
     113    git.branch          1ee761deea4b8b6ce2c503e080243ab20e90a80d
    107114
    108115    livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
     
    132139    }
    133140
    134     # GNU Radio 3.7.1+ works with Apple GCC, some Apple clang >=
    135     # 500.2.79, and MacPorts clang 3.4 or newer; blacklist other
    136     # compilers.
    137 
    138     if {${os.major} == 13} {
    139         # works with Apple's clang 500.2.79 on 10.9, but not 10.8.
    140         compiler.blacklist-append { clang < 500.2.79 }
    141     } else {
    142         compiler.blacklist-append clang
    143     }
    144 
    145     compiler.blacklist-append \
    146         macports-clang-2.9 macports-clang-3.1 \
    147         macports-clang-3.2 macports-clang-3.3
    148 
    149 
    150 } else {
    151 
    152     # legacy works with Apple GCC only, because the cmake build script
    153     # does not robustly check for the xgetbv instruction; a fix for
    154     # this issue is in release 3.7.1 and newer.
    155 
    156     compiler.blacklist-append *clang* macports*
    157 
    158 }
    159 
    160 compiler.blacklist-append dragonegg*
     141    # add check for cvtpi32_ps intrinsic
     142
     143    patchfiles-append patch-volk_lib_CMakeLists.txt.diff
     144
     145}
    161146
    162147use_parallel_build  yes
     
    181166platform darwin 13 {
    182167    pre-patch {
    183         set std_dest_dir ${worksrcpath}/gnuradio-runtime/swig/std
    184         if {[file exists ${std_dest_dir}]} {
    185             delete ${std_dest_dir}
     168        if {${subport} eq "gnuradio-legacy"} {
     169            # legacy has a different directory structure
     170            set std_dest_dir ${worksrcpath}/gnuradio-core/src/lib/swig/std
     171            if {[file exists ${std_dest_dir}]} {
     172                delete ${std_dest_dir}
     173            }
     174            copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir}
     175            patchfiles-append \
     176                patch-gnuradio-core_swig_std_std_container.i.diff \
     177                patch-gnuradio-core_swig_include-std_string.i.diff
     178        } else {
     179            set std_dest_dir ${worksrcpath}/gnuradio-runtime/swig/std
     180            if {[file exists ${std_dest_dir}]} {
     181                delete ${std_dest_dir}
     182            }
     183            copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir}
     184            patchfiles-append \
     185                patch-gnuradio-runtime_swig_std_std_container.i.diff
     186            if {${subport} eq "gnuradio"} {
     187                # patch for fix swig build on 10.9; tested on 10.8
     188                # and does not seem to hurt.  This patch is already
     189                # integrated upstream.
     190                patchfiles-append \
     191                    patch-gnuradio-runtime_swig_std_std_container.i.diff
     192            }
    186193        }
    187         copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir}
    188194    }
    189     patchfiles-append patch-gnuradio-runtime_swig_std_std_container.i.diff
    190195}
    191196
     
    235240
    236241variant full description {Deprecated legacy variant} {}
     242default_variants -full
    237243
    238244# per user concensus: enable all variants except +debug and +universal
  • trunk/dports/science/gnuradio/files/patch-path-order.diff

    r107395 r113561  
    1 diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake
    2 index b9bf0bb..eb2dce3 100644
    3 --- a/cmake/Modules/GrSwig.cmake
    4 +++ b/cmake/Modules/GrSwig.cmake
     1--- cmake/Modules/GrSwig.cmake.orig
     2+++ cmake/Modules/GrSwig.cmake
    53@@ -118,8 +118,8 @@ macro(GR_SWIG_MAKE name)
    64     find_package(PythonLibs)
     
    1412     #determine include dependencies for swig file
    1513     execute_process(
    16 diff --git a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
    17 index c9e2806..48f4445 100644
    18 --- a/gr-audio/lib/CMakeLists.txt
    19 +++ b/gr-audio/lib/CMakeLists.txt
     14--- gr-audio/lib/CMakeLists.txt.orig
     15+++ gr-audio/lib/CMakeLists.txt
    2016@@ -20,18 +20,6 @@
    2117 ########################################################################
     
    125121 target_link_libraries(gnuradio-audio ${gr_audio_libs})
    126122 GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel")
    127 diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt
    128 index 3e8c516..627135a 100644
    129 --- a/gruel/CMakeLists.txt
    130 +++ b/gruel/CMakeLists.txt
     123--- gruel/CMakeLists.txt.orig
     124+++ gruel/CMakeLists.txt
    131125@@ -37,7 +37,6 @@ include(GrMiscUtils)
    132126 GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS
Note: See TracChangeset for help on using the changeset viewer.