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. 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],