Skip to content
Permalink
Browse files

[volk-]gnss-sdr-next: update to c2dfc82b (20180411).

  • Loading branch information
michaelld committed Apr 12, 2018
1 parent 05addf4 commit a3aebb22321848d55779d94f409e78be72025c1a
Showing with 38 additions and 10 deletions.
  1. +5 −5 science/gnss-sdr/Portfile
  2. +10 −5 science/volk-gnss-sdr/Portfile
  3. +23 −0 science/volk-gnss-sdr/files/patch-fix_cxx1z.diff
@@ -70,11 +70,11 @@ subport gnss-sdr-next {
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.

name gnss-sdr-next
github.setup gnss-sdr gnss-sdr 4a52e74b3157391e88c188b4a8c848cf96ff0ef1
version 20180330
checksums rmd160 3f5a58af16addd1cfca505e0e2a3759a58f9f087 \
sha256 b3c10e95909fb4fea427e6423b2093bb82ecd35771e783c040bcea25061ce9a1 \
size 3430291
github.setup gnss-sdr gnss-sdr c2dfc82bf373788f91debc1d02a98e768ee1df9c
version 20180411
checksums rmd160 8947dcb410400e1658f93660a220a63ab5ef2b51 \
sha256 11272d5de98dbe81ea821319e053aaef8110d6a14c765f7ceb7e9361f04c006d \
size 3407499

conflicts gnss-sdr gnss-sdr-devel

@@ -62,18 +62,23 @@ subport volk-gnss-sdr-next {
This port is kept up with the VOLK-GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of VOLK-GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnss-sdr-next and gnuradio-next ports. 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.

name volk-gnss-sdr-next
github.setup gnss-sdr gnss-sdr 4a52e74b3157391e88c188b4a8c848cf96ff0ef1
version 20180330
checksums rmd160 3f5a58af16addd1cfca505e0e2a3759a58f9f087 \
sha256 b3c10e95909fb4fea427e6423b2093bb82ecd35771e783c040bcea25061ce9a1 \
size 3430291
github.setup gnss-sdr gnss-sdr c2dfc82bf373788f91debc1d02a98e768ee1df9c
version 20180411
checksums rmd160 8947dcb410400e1658f93660a220a63ab5ef2b51 \
sha256 11272d5de98dbe81ea821319e053aaef8110d6a14c765f7ceb7e9361f04c006d \
size 3407499

conflicts volk-gnss-sdr volk-gnss-sdr-devel

# overload the github livecheck branch

github.livecheck.branch next

# temporary patch to fix setting of C++ standard

patchfiles-append patch-fix_cxx1z.diff
patch.pre_args -p1

}

# override github PortGroup homepage setting
@@ -0,0 +1,23 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,16 +78,17 @@
# Enable C++17 support in Clang >= 6.0.0 or AppleClang >= 900
# Enable C++14 support in 6.0.0 > Clang >= 3.5.0 or 900 > AppleClang >= 600
# Fallback to C++11 if older version
+
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
# See https://trac.macports.org/wiki/XcodeVersionInfo for Apple Clang version equivalences
if(CLANG_VERSION VERSION_LESS "600")
- set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_STANDARD 11)
else(CLANG_VERSION VERSION_LESS "600")
if(CLANG_VERSION VERSION_LESS "900")
- set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+ set(CMAKE_CXX_STANDARD 14)
else(CLANG_VERSION VERSION_LESS "900")
- set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
+ set(CMAKE_CXX_STANDARD 17)
endif(CLANG_VERSION VERSION_LESS "900")
endif(CLANG_VERSION VERSION_LESS "600")
else(CMAKE_SYSTEM_NAME MATCHES "Darwin")

0 comments on commit a3aebb2

Please sign in to comment.
You can’t perform that action at this time.