Ticket #51412: Portfile-gnss-sdr.diff

File Portfile-gnss-sdr.diff, 5.2 KB (added by carlesfernandez (Carles Fernandez), 8 years ago)

Portfile patch as unified diff

  • Portfile

    old new  
    88PortGroup           active_variants 1.1
    99
    1010name                gnss-sdr
    11 maintainers         michaelld gmail.com:carlesfernandez openmaintainer
     11maintainers         michaelld gmail.com:carles.fernandez openmaintainer
    1212description         An Open Source Global Navigation Satellite Systems (GNSS)(for example: GPS, Galileo, Glonass, Beidou, etc) Software Defined Radio (SDR) Receiver
    1313categories          science
    1414license             GPL-3
    … …  
    2121    long_description    ${description}: \
    2222        This port is kept up with the GNSS-SDR release, which is typically updated every few months. This version compiles against the gnuradio port, which represents the current GNU Radio release.
    2323
    24     github.setup        gnss-sdr gnss-sdr 0.0.6 v
    25     revision            7
    26     checksums           rmd160 3a578f4795f6230d3f627dbe6f80f77c7dac206e \
    27                         sha256 ed81a5dff8d91b0b1d561ab8a240818da447c8358b95ab42d6a17b479e873c3e
     24    github.setup        gnss-sdr gnss-sdr 0.0.7 v
     25    revision            1
     26    checksums           rmd160 c9bee1c541979d2ae573ae63848051354ef3f68f \
     27                        sha256 3b25a45c6faa48017176858c2673a1301ead3b4cf7cdc52bdfad3e05669e90ae
    2828    github.tarball_from tags
    2929
    3030    conflicts           gnss-sdr-devel gnss-sdr-next
    … …  
    3333
    3434    require_active_variants port:gnuradio uhd
    3535
    36     # temporary patch to fix Volk #define in compatibility
    37 
    38     patchfiles-append patch-volk.diff
    39 
    40     # temporary patch; will be fixed in next release.
    41 
    42     post-patch {
    43         reinplace "s@multithread@opencl@g" ${worksrcpath}/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
    44     }
    45 
    4636}
    4737
    4838subport gnss-sdr-devel {
    … …  
    5141        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.
    5242
    5343    name                gnss-sdr-devel
    54     github.setup        gnss-sdr gnss-sdr 3d44e0956cc4524598bbab012ef77ebe30c955b4
    55     version             20151115
    56     revision            7
    57     checksums           rmd160 94c604bef6a7cf60a38320391ce58d7a859e7277 \
    58                         sha256 5185d830813a50c0a7ec64f47d99f76a23574aeca4dc464e9b7afed8913dbd91
     44    github.setup        gnss-sdr gnss-sdr a6df9f8c6f4c5665976cfa70e844ce1b56ac7323
     45    version             20160516
     46    revision            1
     47    checksums           rmd160 c9bee1c541979d2ae573ae63848051354ef3f68f \
     48                        sha256 3b25a45c6faa48017176858c2673a1301ead3b4cf7cdc52bdfad3e05669e90ae
    5949
    6050    conflicts           gnss-sdr gnss-sdr-next
    6151
    … …  
    7060        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.
    7161
    7262    name                gnss-sdr-next
    73     github.setup        gnss-sdr gnss-sdr 633655616370d06f406beed834f6607da7f41e52
    74     version             20151115
    75     revision            7
    76     checksums           rmd160 53dd8fd6752337aad69773ddc94e9abc4b483573 \
    77                         sha256 79787927a11e7aef0a4c4c903153e5c3b9520b7c7d9caccc0f0f903bd8ab20e0
     63    github.setup        gnss-sdr gnss-sdr 51e9a3434da85547a7860d298fcc5c180e390f19
     64    version             20160516
     65    revision            1
     66    checksums           rmd160 ea87a5cc389ab366248a84131991396e3cfc815d \
     67                        sha256 644a19b780ad3004fbe34924f0fb422b48febf565babc3c9f088192049bf3bc6
    7868
    7969    conflicts           gnss-sdr gnss-sdr-devel
    8070
    … …  
    8474
    8575}
    8676
    87 # override githib PortGroup homepage setting
     77# override github PortGroup homepage setting
    8878
    8979homepage            http://gnss-sdr.org
    9080
    … …  
    9686    path:lib/libuhd.dylib:uhd \
    9787    port:python27 \
    9888    port:py27-cheetah \
     89    port:gnutls \
    9990    port:boost
    10091
    101 # release uses openssl while devel and next use gnutls;
    102 # next release update to just gnutls.
    103 
    104 if {${subport} eq "gnss-sdr"} {
    105     depends_lib-append  path:lib/libssl.dylib:openssl
    106 } else {
    107     depends_lib-append  port:gnutls
    108 }
    10992
    11093# require specific variants
    11194
    … …  
    120103
    121104configure.ldflags-delete -L${prefix}/lib
    122105
     106# build own google-flog until the port is fixed (builds well but fails at runtime)
    123107configure.args-append \
    124108    -DENABLE_PACKAGING=OFF \
    125     -DENABLE_OWN_GLOG=OFF \
     109    -DENABLE_OWN_GLOG=ON \
    126110    -DENABLE_GENERIC_ARCH=OFF
    127111
    128112# specify the Python version to use