From ffbb8ff708c9d876b3f2091548311aacc7960106 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 11 Oct 2025 13:29:14 -0700 Subject: [PATCH] schroot: fix compilation with boost 1.89 Patch taken from reschroot. Signed-off-by: Rosen Penev --- admin/schroot/Makefile | 2 +- admin/schroot/patches/020-gcc14.patch | 2 +- admin/schroot/patches/040-boost-189.patch | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 admin/schroot/patches/040-boost-189.patch diff --git a/admin/schroot/Makefile b/admin/schroot/Makefile index 1d175bd62c..99e2e160e5 100644 --- a/admin/schroot/Makefile +++ b/admin/schroot/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=reschroot PKG_VERSION:=1.6.13 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeberg.org/shelter/reschroot/archive/release diff --git a/admin/schroot/patches/020-gcc14.patch b/admin/schroot/patches/020-gcc14.patch index 23a57ac19e..9e0aade3ab 100644 --- a/admin/schroot/patches/020-gcc14.patch +++ b/admin/schroot/patches/020-gcc14.patch @@ -15,7 +15,7 @@ ${public_chroot_facet_cc_sources}) target_link_libraries(sbuild PRIVATE -+ Intl::Intl ++ Intl::Intl ${CMAKE_THREAD_LIBS_INIT} ${PAM_LIBRARY} ${UUID_LIBRARY} diff --git a/admin/schroot/patches/040-boost-189.patch b/admin/schroot/patches/040-boost-189.patch new file mode 100644 index 0000000000..9d530b64d4 --- /dev/null +++ b/admin/schroot/patches/040-boost-189.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,11 @@ find_package(Threads REQUIRED) + + include(FindBoost) + find_package(Boost REQUIRED +- COMPONENTS filesystem system iostreams program_options regex) ++ COMPONENTS filesystem iostreams program_options regex) ++if(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION LESS 69) ++ list(APPEND BOOST_REQUIRED_COMPONENTS system) ++ find_package(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) ++endif() + + # HEADER CHECKS + include(CheckIncludeFileCXX)