fix FTBFS with boost 1.71

ubuntu/focal
Rik Mills 5 years ago
parent 4efcfde747
commit 4989aced7a

7
debian/changelog vendored

@ -1,3 +1,10 @@
calamares (3.2.17.1-0ubuntu4) focal; urgency=medium
* Add patch to fix cmake finding boost 1.71. Fixes FTBFS.
- debian/patches: cmake-fix-find-boost.patch
-- Rik Mills <rikmills@kde.org> Sun, 09 Feb 2020 20:43:08 +0000
calamares (3.2.17.1-0ubuntu3) focal; urgency=medium calamares (3.2.17.1-0ubuntu3) focal; urgency=medium
* No change rebuild against new boost1.71 ABI * No change rebuild against new boost1.71 ABI

@ -0,0 +1,16 @@
Description: CMake: fix find-boost with 1.71
Origin: https://github.com/calamares/calamares/commit/c482990bc5b5233e2f4abda75fda8700308f5bea
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -322,6 +322,10 @@
)
if ( PYTHONLIBS_FOUND )
+ # Since Boost provides CMake config files (starting with Boost 1.70.
+ # or so) the mess that is the Calamares find code picks the wrong
+ # bits. Suppress those CMake config files, as suggested by @jmrcpn
+ set(Boost_NO_BOOST_CMAKE ON)
include( BoostPython3 )
find_boost_python3( ${BOOSTPYTHON_VERSION} ${PYTHONLIBS_VERSION_STRING} CALAMARES_BOOST_PYTHON3_FOUND )
set_package_properties(

@ -1,2 +1,3 @@
0001-replace-pkexec-by-sudo.patch 0001-replace-pkexec-by-sudo.patch
apport-package-hook.patch apport-package-hook.patch
cmake-fix-find-boost.patch

Loading…
Cancel
Save