From a2f1349ff45fdd249932b0a74f82d9fe79a2cb63 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 26 Mar 2026 16:24:13 +1100 Subject: [PATCH 1/2] MDEV-39015 Debian - remove libboost-date-time-dev dependency In Debian Bullseye + Ubuntu 22.04 the libboost-date-time library (1.74 boost version) has been a dummy stub. The header files for boost-date-time are in the libboost-dev package. --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index 9458fe60445ce..25dbaad59b47e 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: bison, libaio-dev [linux-any], libboost-atomic-dev [amd64 arm64], libboost-chrono-dev [amd64 arm64], - libboost-date-time-dev [amd64 arm64], libboost-dev, libboost-filesystem-dev [amd64 arm64], libboost-regex-dev [amd64 arm64], From 718acc82bb7e8d41d98cdc6859e9c2c7243a6f84 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 26 Mar 2026 16:26:36 +1100 Subject: [PATCH 2/2] MDEV-39015 Debian - columnstore boost deps 1.88+ Columnstore 23.10, the version in MariaDB-server-11.4+ is strictly dependant on a 1.88+ boost version. As such remove the libboost-[^d]* dependencies of columnstore until such Debian/Ubuntu version support this. libboost-dev is still needed for oqgraph These version are: * forky/sid * questing/resolute The debian/control always contains the version that would compile on debian/sid. The debian/autobake-deb.sh adjusts the control file on earlier distros to remove the dependencies. --- debian/autobake-deb.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 0e11a98f8302d..8107db11227c0 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -62,6 +62,14 @@ remove_package_notes() sed -e '/package.notes/d' -i debian/rules debian/control } +remove_columnstore_boost_deps() +{ + # libboost-dev still needed for oqgraph + # The rest, atomic, chrono, regex, filesystem, thread + # are columnstore, and it insists on 1.88+ + sed -e '/libboost-[^d]/d' -i debian/control +} + architecture=$(dpkg-architecture -q DEB_BUILD_ARCH) uname_machine=$(uname -m) @@ -109,7 +117,10 @@ in remove_uring fi ;& - "trixie"|"forky"|"sid") + "trixie") + remove_columnstore_boost_deps + ;& + "forky"|"sid") # The default packaging should always target Debian Sid, so in this case # there is intentionally no customizations whatsoever. ;; @@ -128,7 +139,10 @@ in replace_uring_with_aio fi ;& - "noble"|"oracular"|"plucky"|"questing") + "noble"|"oracular"|"plucky") + remove_columnstore_boost_deps + ;& + "questing"|"resolute") # mariadb-plugin-rocksdb s390x not supported by us (yet) # ubuntu doesn't support mips64el yet, so keep this just # in case something changes.