Changeset 113092


Ignore:
Timestamp:
Nov 8, 2013, 5:50:28 PM (4 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:
1 edited

Legend:

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

    r113068 r113092  
    2121dist_subdir         gnuradio
    2222
    23 # TODO: Support Mavericks once this port builds with clang++
    2423platform darwin {
    2524    if {${os.major} >= 13} {
    26         depends_lib
    27         depends_run
    2825        pre-fetch {
    29             ui_error "$name does not build on Mavericks or later."
    30             error "unsupported platform"
     26            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."
    3127        }
    3228    }
     
    8682        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.
    8783
    88     version             3.7.2_20131106
     84    version             3.7.2_20131107
    8985
    9086    conflicts           gnuradio-legacy gnuradio gnuradio-next
     
    9288    fetch.type          git
    9389    git.url             http://git.gnuradio.org/git/gnuradio.git
    94     git.branch          5f724cfd76ad52288db91b535b4366c176717d29
     90    git.branch          5997f309e8209219851bb62b7e76184395b8630b
    9591
    9692    livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=master
     
    105101        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.
    106102
    107     version             3.8.0_20131106
     103    version             3.8.0_20131107
    108104
    109105    conflicts           gnuradio-legacy gnuradio gnuradio-devel
     
    111107    fetch.type          git
    112108    git.url             http://git.gnuradio.org/git/gnuradio.git
    113     git.branch          66e4d1aa42d1458b535d13162b4b57b0653b9136
     109    git.branch          7c652f08b06497a50836b3be92bddb0c314bc803
    114110
    115111    livecheck.url       http://gnuradio.org/cgit/gnuradio.git/log/?h=next
     
    139135    }
    140136
    141     # VOLK requires a GCC variant (Apple or MacPorts), for now;
    142     # blacklist all clang variants, for now.
    143     # http://trac.macports.org/ticket/37979
    144 
    145     compiler.blacklist *clang*
    146 
     137    platform darwin {
     138        if {${os.major} < 13} {
     139
     140            # VOLK requires a GCC variant (Apple or MacPorts), for
     141            # now; blacklist all clang variants, for now.
     142            # http://trac.macports.org/ticket/37979
     143
     144            compiler.blacklist *clang*
     145        }
     146    }
    147147} else {
    148148
     
    495495}
    496496
     497# disable SWIG (and GRC) on 10.9 until SWIG works better
     498
     499platform darwin {
     500    if {${os.major} >= 13} {
     501
     502        default_variants -swig -grc
     503
     504        if {[variant_isset swig] || [variant_isset grc]} {
     505
     506            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."
     507            error "unsupported platform"
     508
     509        }
     510    }
     511}
     512
    497513if {![variant_isset swig]} {
    498514
     
    525541# shortcut to installing all variants except Python
    526542
    527 variant full \
    528     requires docs grc qtgui wxgui uhd orc wavelet jack portaudio swig sdl \
    529     description {Enable all variants except +debug and +universal (and, for next, except +ctrlport)} {}
    530 
     543platform darwin {
     544    if {${os.major} >= 13} {
     545
     546        variant full \
     547            requires docs qtgui wxgui uhd orc wavelet jack portaudio sdl \
     548            description {Enable all variants except +debug and +universal (and, for next, except +ctrlport)} {}
     549
     550    } else {
     551
     552        variant full \
     553            requires docs grc qtgui wxgui uhd orc wavelet jack portaudio swig sdl \
     554            description {Enable all variants except +debug and +universal (and, for next, except +ctrlport)} {}
     555
     556    }
     557}
    531558# make +full the default; per user concensus
    532559
Note: See TracChangeset for help on using the changeset viewer.