Skip to content
Permalink
Browse files

uhd-devel: update to 8bb15ee1 (20180319).

add temporary patch to disable adding Boost DIRS before internal DIRS. This will work in MacPorts, but not in general. We're working on a better solution.
  • Loading branch information
michaelld committed Mar 20, 2018
1 parent 34d40d2 commit 35ce6923675fd283df6bf1afc67fbe2b38282387
Showing with 25 additions and 5 deletions.
  1. +10 −5 science/uhd/Portfile
  2. +15 −0 science/uhd/files/patch-host_CMakeLists.txt.diff
@@ -46,11 +46,11 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced

name uhd-devel
conflicts uhd
github.setup EttusResearch uhd 13c32cefcd6ea45e20e2eca97159ca26603ca533
version 20180305
checksums rmd160 99130758e36dc7feeedd56a7ddf2621a379a993d \
sha256 4f8f62a010240e094f51b5bb38f03eda774bc63075fe14b483f79caa01d93cea \
size 9279636
github.setup EttusResearch uhd 8bb15ee133ea98d6755d392b8493966c785291dd
version 20180319
checksums rmd160 263d0bb9e56f40b6d94c357b9467a6655080e582 \
sha256 764f016e17e2cc2305b2bf61646cba92be6284ca9ddd663e2fd4f857b6b7bdf7 \
size 9289076

# overload the github livecheck URL with the maint branch,
# when it is more advanced; comment out for master.
@@ -61,6 +61,11 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced

set UHD_VERSION_INFO "git-[string range ${github.version} 0 7](${version})"

# temporary patch to disable Boost DIRS before internal DIRS

patchfiles-append patch-host_CMakeLists.txt.diff
patch.pre_args -p1

}

# override the github Portgroup's homepage setting
@@ -0,0 +1,15 @@
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index ab7f41f..06cd1af 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -324,8 +324,8 @@ SET(Boost_ADDITIONAL_VERSIONS
)
FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})

-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+# LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})

MESSAGE(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
MESSAGE(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")

0 comments on commit 35ce692

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