MDEV-31045: Fix regression building on Ubuntu 18.04

illuusio · grooverdan · commit 1e4eef5c1716 · 2023-04-13T21:49:02.000+08:00
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.
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ replace_uring_with_aio()`
`64`	`64`	`disable_pmem()`
`65`	`65`	`{`
`66`	`66`	`sed '/libpmem-dev/d' -i debian/control`
`67`		`- sed '/-DWITH_PMEM=YES/d' -i debian/rules`
	`67`	`+ sed '/-DWITH_PMEM=ON/d' -i debian/rules`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`architecture=$(dpkg-architecture -q DEB_BUILD_ARCH)`