Skip to content
Permalink
Browse files

uhd-devel: update to 69c320d7 (20190227)

+ remove integrated patches;
+ now uses PyBind11 via internal code, so move boost::python reinplace to just the release.
  • Loading branch information
michaelld committed Mar 1, 2019
1 parent 6d67d70 commit 16f14424a8427cceac48d5fbb15619130cb377db
@@ -52,6 +52,18 @@ Provides the release version, which is typically updated every month or so.

patchfiles-append patch-fix-boost-python.release.diff

# temporary patch to fix searching for Boost::Python, which
# depends on the version of Boost & which Python. 2 parts: a patch
# and then reinplace. This is part 2.
post-patch {
# need to do this only for +python3X variants
if {${PythonVersionNoDot} ne "27"} {
reinplace "s|@PythonVersionNoDot@|${PythonVersionNoDot}|g" \
${worksrcpath}/host/CMakeLists.txt
reinplace "s|@PythonVersionWithDot@|${PythonVersionWithDot}|g" \
${worksrcpath}/host/CMakeLists.txt
}
}
}

subport uhd-39lts {
@@ -83,14 +95,14 @@ subport uhd-devel {
long_description ${description}: \
Provides the UHD GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.

github.setup EttusResearch uhd 52138314a4daa8140b4dabca5ca4a9ffc6a8ff84
version 20190213
checksums rmd160 50a5e7e8ef9c527431a65a8c8688e4dfdeea8cae \
sha256 90232c8d9bfc537756d28cafbec59f80fcd8f4c5ca4f7e6972fa34fde1580328 \
size 12933066
revision 2
github.setup EttusResearch uhd 69c320d7cfcebab4944ef654e80e47bbb32e4917
version 20190227
checksums rmd160 ee57f420236a0eaa1f74d81233e0df52d75212cf \
sha256 637bcaad28e042a7e16d4204d1f8919e7abf8da1faab7d0c20d7c9c88faf5cd2 \
size 13018332
revision 0

conflicts uhd uhd-39lts
conflicts uhd uhd-39lts

# set the version override string

@@ -101,24 +113,12 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
patchfiles-append patch-host_CMakeLists.txt.devel.diff
patch.pre_args -p1

# temporary patch to fix searching for Boost::Python, which
# depends on the version of Boost & which Python. 2 parts: a patch
# and then reinplace. This is part 1.

patchfiles-append patch-fix-boost-python.devel.diff

# temporary patch to revert the version bumb from 3.14 to 3.15,
# until the release port is also bumped, so that I don't have to
# revv-bump all dependencies until that time, and for both ports.

patchfiles-append patch-revert-version-bump.devel.diff

# temporary patch to remove $(prefix)/lib from the explicit DYLD
# list when performing unit tests, for "APPLE" only (not Linux or
# other Unix)

patchfiles-append patch-fix-cmake-unittest-dyld-list.diff

# set the variable UHD_VERSION_DEVEL to TRUE, no matter its current setting
post-patch {
reinplace "s@^set\(UHD_VERSION_DEVEL\[^\)\]*@set(UHD_VERSION_DEVEL TRUE@1" \
@@ -137,18 +137,6 @@ if {${subport} ne "uhd-39lts"} {
# see also < https://trac.macports.org/ticket/55980 >
compiler.blacklist-append { clang < 800 }

# temporary patch to fix searching for Boost::Python, which
# depends on the version of Boost & which Python. 2 parts: a patch
# and then reinplace. This is part 2.
post-patch {
# need to do this only for +python3X variants
if {${PythonVersionNoDot} ne "27"} {
reinplace "s|@PythonVersionNoDot@|${PythonVersionNoDot}|g" \
${worksrcpath}/host/CMakeLists.txt
reinplace "s|@PythonVersionWithDot@|${PythonVersionWithDot}|g" \
${worksrcpath}/host/CMakeLists.txt
}
}
}

# temporary patch to fix the API usage for "gpsd_read" for the 3.18.0

This file was deleted.

This file was deleted.

@@ -1,8 +1,8 @@
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index cfbc81d..f5159f2 100644
index 37e9eda..1f579f9 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -341,8 +341,8 @@
@@ -338,8 +338,8 @@ find_package(Boost ${BOOST_MIN_VERSION} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COM
message(STATUS "Looking for required Boost components...")
find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_REQUIRED_COMPONENTS})

@@ -11,5 +11,5 @@ index cfbc81d..f5159f2 100644
+# include_directories(${Boost_INCLUDE_DIRS})
+# link_directories(${Boost_LIBRARY_DIRS})

#Check to see if the Python version we're looking for exists
set(BOOST_PYTHON_FOUND ${Boost_PYTHON_FOUND})
message(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}")
message(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}")

0 comments on commit 16f1442

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