Ticket #49347: gnss-sdr-20151018.2.diff

File gnss-sdr-20151018.2.diff, 4.3 KB (added by carlesfernandez (Carles Fernandez), 9 years ago)

  • Portfile

    old new  
    2424    github.setup        gnss-sdr gnss-sdr 0.0.6 v
    2525    checksums           rmd160 3a578f4795f6230d3f627dbe6f80f77c7dac206e \
    2626                        sha256 ed81a5dff8d91b0b1d561ab8a240818da447c8358b95ab42d6a17b479e873c3e
     27
    2728    github.tarball_from tags
    2829
    2930    conflicts           gnss-sdr-devel gnss-sdr-next
    3031
    31     depends_lib-append  port:gnuradio
     32    depends_lib-append  port:gnuradio path:lib/libssl.dylib:openssl
    3233
    3334    require_active_variants port:gnuradio uhd
    3435
    … …  
    4243        reinplace "s@multithread@opencl@g" ${worksrcpath}/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
    4344    }
    4445
     46    set                 add_osmosdr true
     47
    4548}
    4649
    4750subport gnss-sdr-devel {
    … …  
    5053        This port is kept up with the GNSS-SDR GIT master branch, which is typically updated daily to weekly.  This version of GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnuradio-devel port, which represents GNU Radio GIT master branch.  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 gnss-sdr and gnuradio ports, cleaning any current builds, and trying again.
    5154
    5255    name                gnss-sdr-devel
    53     github.setup        gnss-sdr gnss-sdr b665444550e90bf595ade110cd57d69cf98145b9
    54     version             20150918
    55     checksums           rmd160 b6681236a4376d72cb606572e1ca0e3767b63681 \
    56                         sha256 22a4f14e3f84d45d10025499272d406c7a6ef427b0f22df04491dd3a28ce561b
     56    github.setup        gnss-sdr gnss-sdr 5c885627b5a3bbb26773910e801656a506a45c83
     57    version             20151018
     58    checksums           rmd160 8081aa17eb02616852cd216e7a5e4cb4041d89c4 \
     59                        sha256 920f9af0135d683b4e9f52f191b0195d69fbb882c911503aa4b73262d04d0bfd
    5760
    5861    conflicts           gnss-sdr gnss-sdr-next
    5962
    … …  
    6164
    6265    require_active_variants port:gnuradio-devel uhd
    6366
     67    set                 add_osmosdr true
     68
    6469}
    6570
    6671subport gnss-sdr-next {
    … …  
    6873        This port is kept up with the GNSS-SDR GIT next branch, which is typically updated daily to weekly.  This version of GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnuradio-next port, which represents GNU Radio GIT next branch.  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 gnss-sdr and gnuradio ports, cleaning any current builds, and trying again.
    6974
    7075    name                gnss-sdr-next
    71     github.setup        gnss-sdr gnss-sdr b665444550e90bf595ade110cd57d69cf98145b9
    72     version             20150918
    73     checksums           rmd160 b6681236a4376d72cb606572e1ca0e3767b63681 \
    74                         sha256 22a4f14e3f84d45d10025499272d406c7a6ef427b0f22df04491dd3a28ce561b
     76    github.setup        gnss-sdr gnss-sdr 8f3a509a002ab2d0146804e11c1eb7cdb3dd603c
     77    version             20151018
     78    checksums           rmd160 ebc7f41cc4b37db78de460a136560e2591aa7c4c \
     79                        sha256 65ad6fa553ca33a49740a42d121ee5891c46b1f12c3913b86f3535600e76b4d1
    7580
    7681    conflicts           gnss-sdr gnss-sdr-devel
    7782
    … …  
    7984
    8085    require_active_variants port:gnuradio-next uhd
    8186
     87    set                 add_osmosdr false
     88
    8289}
    8390
    8491# override githib PortGroup homepage setting
    … …  
    9198    port:armadillo \
    9299    port:google-glog \
    93100    port:orc \
    94     port:openssl \
     101    port:gnutls \
    95102    path:lib/libuhd.dylib:uhd \
    96103    port:py27-cheetah
    97104
    … …  
    116123# enable default variants: all except +docs, +debug, and +universal
    117124# do not enable +docs because it requires a non-standard variant for doxygen.
    118125
    119 default_variants +osmosdr +opencl
     126if {${add_osmosdr} eq true} {
     127    default_variants +osmosdr +opencl
     128}
     129
     130# do not enable +osmosdr in next, since gr-osmosdr does not link against gnuradio-next
     131if {${add_osmosdr} eq false} {
     132    default_variants +opencl
     133}
     134
     135
    120136
    121137variant docs description "Install ${name} documentation" {
    122138