<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/68380ffffa563307c511430bb16725316cbef4be">https://github.com/macports/macports-ports/commit/68380ffffa563307c511430bb16725316cbef4be</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 68380ff bladeRF: update to 9dd43725 (20190128)
</span>68380ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 68380ffffa563307c511430bb16725316cbef4be
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Feb 19 15:57:17 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> bladeRF: update to 9dd43725 (20190128)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + have to load submodule for AD's "no-OS" repo manually;
</span><span style='display:block; white-space:pre;color:#404040;'> + disable "clock_gettime" shim patch in the hopes the legacy PG does the trick.
</span>---
science/bladeRF/Portfile | 80 ++++++++++++++++++++++++--
science/bladeRF/files/patch-clang-matches.diff | 6 +-
2 files changed, 77 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bladeRF/Portfile b/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42c0ab7..00f30a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,11 +9,79 @@ PortGroup legacysupport 1.0
</span> # Only enable legacy support on OSX10.6 or older
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Nuand bladeRF 4a61cfb5680e56c14ba8fdfeb29cc3970dd2a876
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20181031
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8b00e3eaaeefccca1a61a469c2f4a0f636318113 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9b677b1eac90010438f6fd0788b6160b83ac7b0d9be0356a4ff8d68ca630209f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2197865
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Nuand bladeRF 9dd43725c981ede12088dadfe8193365bec07bb2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20190128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# no-OS is a submodule, but because we're not cloning into a GIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# module in the first place, we can't use the git submodule
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# feature. Have to download separately and install into the correct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# location to get this port to work! Which means we need a no-OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# commit and so forth ... basically replicate what the github PG does
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# but without using it since it is not designed to be used for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# multiple downloads.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set no_OS_github_author analogdevicesinc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set no_OS_github_project no-OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this commit comes from the patchfiles inside the bladeRF tarball, in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "thirdparty/analogdevicesinc/no-OS_local/patches"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set no_OS_commit 0bba46e6f6f75785a65d425ece37d0a04daf6157
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bladeRF_distname ${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set bladeRF_distfile ${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set no_OS_distname ${no_OS_github_project}-${no_OS_commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set no_OS_distfile ${no_OS_distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${bladeRF_distfile}:tagone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${no_OS_distfile}:tagtwo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${github.homepage}/tarball/${git.branch}:tagone \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/${no_OS_github_author}/${no_OS_github_project}/tarball/${no_OS_commit}:tagtwo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${bladeRF_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 55cbe0a6196e2999871049ca2640af9cacc11eae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6ef28223222db7b66780de6d7c3bc6da13f2a53a2844122b21de4fd45453b42d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2183802 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${no_OS_distfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 dbe43395fc0b22919ac7e6a5e2f355987e4dd2b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 53670c8f0a9feaa774d8c3067ba201b31c0197294bdd00a1795c72a0368aac40 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44184797
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # roughly replicate what's going on in the github PG post-extract
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for the main tarball extract directory name. It doesn't work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # here because we're using tags.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists [glob -nocomplain ${workpath}/${github.author}-${github.project}-*]] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file isdirectory [glob -nocomplain ${workpath}/${github.author}-${github.project}-*]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "move [glob ${workpath}/${github.author}-${github.project}-*] ${workpath}/${distname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move [glob ${workpath}/${github.author}-${github.project}-*] ${workpath}/${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tarball is not "${github.author}-${github.project}-*"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\NError: \${worksrcpath} for 'bladeRF' does not exist after extracting distfiles. This might indicate that the author or project is different than set in the Portfile due to a rename at GitHub. Please examine the extracted directory in ${workpath} and try to correct the Portfile by either changing the author or project or adding the worksrcdir option with the correct directory name.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Unexpected github tarball extract."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists [glob -nocomplain ${workpath}/${no_OS_github_author}-${no_OS_github_project}-*]] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [file isdirectory [glob -nocomplain ${workpath}/${no_OS_github_author}-${no_OS_github_project}-*]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "move [glob ${workpath}/${no_OS_github_author}-${no_OS_github_project}-*] ${workpath}/${no_OS_distname}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move [glob ${workpath}/${no_OS_github_author}-${no_OS_github_project}-*] ${workpath}/${no_OS_distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tarball is not "${no_OS_github_author}-${no_OS_github_project}-*"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "\n\NError: \${worksrcpath} no 'no-OS' does not exist after extracting distfiles. This might indicate that the author or project is different than set in the Portfile due to a rename at GitHub. Please examine the extracted directory in ${workpath} and try to correct the Portfile by either changing the author or project or adding the worksrcdir option with the correct directory name.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Unexpected github tarball extract."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # put the no-OS directory into position
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove the original directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "delete ${worksrcpath}/thirdparty/analogdevicesinc/no-OS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${worksrcpath}/thirdparty/analogdevicesinc/no-OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "move ${workpath}/${no_OS_distname} ${worksrcpath}/thirdparty/analogdevicesinc/no-OS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/${no_OS_distname} ${worksrcpath}/thirdparty/analogdevicesinc/no-OS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
categories science comms
maintainers {michaelld @michaelld} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +95,7 @@ depends_lib-append path:lib/libusb-1.0.dylib:libusb
</span>
# temporary patch to correctly build "test_config_file" on OSX
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-include_clock_gettime.c_shim.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patchfiles-append patch-include_clock_gettime.c_shim.diff
</span>
# temporary patch to fix CMake MATCHES "Clang"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bladeRF/files/patch-clang-matches.diff b/science/bladeRF/files/patch-clang-matches.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c1345f6..17ffebf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/bladeRF/files/patch-clang-matches.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/bladeRF/files/patch-clang-matches.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- host/CMakeLists.txt.orig
+++ host/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,7 @@
</span> option(ENABLE_GDB_EXTENSIONS "Build with -ggdb3 instead of -g" OFF)
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span>
# Personal preference - as much debug info as possible with GDB
if(${ENABLE_GDB_EXTENSIONS})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,7 +119,7 @@
</span> endif(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
endif(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@
</span> # MS Visual Studio
--- host/libraries/libbladeRF/CMakeLists.txt.orig
+++ host/libraries/libbladeRF/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +146,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,7 +152,7 @@
</span> endif()
if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR
</pre><pre style='margin:0'>
</pre>