[debian-mysql] Bug#1051222: mariadb FTCBFS: passes host CFLAGS to the native build

[Helmut Grohne]

Source: mariadb
Version: 1:10.11.4-1
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

mariadb started failing to cross build from source with a recent dpkg
upload. In that upload, the default CFLAGS for arm64 gained a value that
is incompatible with any other architecture. Passing the arm64 CFLAGS to
any other compiler makes things fail. This is what is happening now. In
the native build pass I foolishly forgot to ask debhelper to recompute
the build flags and as a result it passes the host flags to the native
build. The solution is fairly simple and attached. Hope it helps.

Helmut
-------------- next part --------------
diff --minimal -Nru mariadb-10.11.4/debian/changelog mariadb-10.11.4/debian/changelog
--- mariadb-10.11.4/debian/changelog	2023-06-04 20:22:27.000000000 +0200
+++ mariadb-10.11.4/debian/changelog	2023-09-04 08:36:45.000000000 +0200
@@ -1,3 +1,10 @@
+mariadb (1:10.11.4-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Do not pass host CFLAGS to the native build. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 04 Sep 2023 08:36:45 +0200
+
 mariadb (1:10.11.4-1) unstable; urgency=medium
 
   [ Otto Kek?l?inen ]
diff --minimal -Nru mariadb-10.11.4/debian/rules mariadb-10.11.4/debian/rules
--- mariadb-10.11.4/debian/rules	2023-06-04 20:22:27.000000000 +0200
+++ mariadb-10.11.4/debian/rules	2023-09-04 08:36:43.000000000 +0200
@@ -107,7 +107,7 @@
 	dh_testdir
 
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-	dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native
+	dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native --reload-all-buildenv-variables
 	dh_auto_build --builddirectory=builddir-native -- import_executables
 endif