summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuukka Pasanen <tuukka.pasanen@ilmi.fi>2023-04-13 10:42:34 +0300
committerTuukka Pasanen <tuukka.pasanen@ilmi.fi>2023-04-13 10:42:34 +0300
commit7eb60dd5a3e30c2d96e8ca3b302487e260b56a8f (patch)
tree04511f411ae19f73f075f2bb939c9a8aa7c64e9b
parent2ddfb838078cb0f81b48ef878d97b966c8d9c494 (diff)
downloadmariadb-git-bb-10.6-all-builders.tar.gz
MDEV-31045: Fix regression building on Ubuntu 18.04bb-10.6-all-builders
Github PR #2424 regressed Ubuntu 18.04 building other than x86_64 machines. Architecture that are impacted are PPC64 and ARM64. This was because of changes in debian/rules file which caused removing dependency to package 'libpmem-dev' and CMake which '-DWITH_PMEM' removing not working correctly. Package libpmem-dev was removed but it still required to have PMEM with CMake which. Commit make change that -DWITH_PMEM is correctly removed if it's not wanted.
-rwxr-xr-xdebian/autobake-deb.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index bad6e6eecf0..e5c5600daf7 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -64,7 +64,7 @@ replace_uring_with_aio()
disable_pmem()
{
sed '/libpmem-dev/d' -i debian/control
- sed '/-DWITH_PMEM=YES/d' -i debian/rules
+ sed '/-DWITH_PMEM=ON/d' -i debian/rules
}
architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)