From 4989aced7ac4a9e893a8872e838f23e13ba95b67 Mon Sep 17 00:00:00 2001 From: Rik Mills Date: Sun, 9 Feb 2020 21:25:05 +0000 Subject: [PATCH] fix FTBFS with boost 1.71 --- debian/changelog | 7 +++++++ debian/patches/cmake-fix-find-boost.patch | 16 ++++++++++++++++ debian/patches/series | 1 + 3 files changed, 24 insertions(+) create mode 100644 debian/patches/cmake-fix-find-boost.patch diff --git a/debian/changelog b/debian/changelog index 9eaa316..a5444d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 09 Feb 2020 20:43:08 +0000 + calamares (3.2.17.1-0ubuntu3) focal; urgency=medium * No change rebuild against new boost1.71 ABI diff --git a/debian/patches/cmake-fix-find-boost.patch b/debian/patches/cmake-fix-find-boost.patch new file mode 100644 index 0000000..6e6f93b --- /dev/null +++ b/debian/patches/cmake-fix-find-boost.patch @@ -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( diff --git a/debian/patches/series b/debian/patches/series index 683ca99..646c946 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-replace-pkexec-by-sudo.patch apport-package-hook.patch +cmake-fix-find-boost.patch