[Pkg-utopia-maintainers] Bug#1064360: volume-key FTCBFS: uses the build architecture python

[Helmut Grohne]

Source: volume-key
Version: 0.3.12-5
Tags: patch
User: debian-cross at lists.debian.org
Usertags: cross-satisfiability ftcbfs

volume-key cannot be cross built from source, because it depends on
python3-dev. This refers to a host architecture Python installation,
which usually is not what we want. Usually, one uses a build
architecture development tools and host architecture libraries. Once
changing them, the build picks up build architecture compiler flags with
a host architecture compiler. This is due to configure.ac searching for
python3-config using AC_PATH_PROG and thus getting the build
architecture one. Using AC_PATH_TOOL fixes the build. I'm attaching a
patch for your convenience.

Helmut
-------------- next part --------------
diff --minimal -Nru volume-key-0.3.12/debian/changelog volume-key-0.3.12/debian/changelog
--- volume-key-0.3.12/debian/changelog	2022-09-08 01:54:16.000000000 +0200
+++ volume-key-0.3.12/debian/changelog	2024-02-20 09:36:48.000000000 +0100
@@ -1,3 +1,12 @@
+volume-key (0.3.12-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+    + Multiarchify python-dev dependency.
+    + cross.patch: Use AC_PATH_TOOL to locate python3-config.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 20 Feb 2024 09:36:48 +0100
+
 volume-key (0.3.12-5) unstable; urgency=medium
 
   * Use dh-sequence-python3 Build-Depends to enable the python3 addon
diff --minimal -Nru volume-key-0.3.12/debian/control volume-key-0.3.12/debian/control
--- volume-key-0.3.12/debian/control	2022-09-08 01:54:16.000000000 +0200
+++ volume-key-0.3.12/debian/control	2024-02-20 09:36:46.000000000 +0100
@@ -12,7 +12,8 @@
                libblkid-dev,
                swig,
                libnss3-tools,
-               python3-dev,
+               libpython3-dev,
+               python3-dev:any,
 Standards-Version: 4.6.1
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/utopia-team/volume-key
diff --minimal -Nru volume-key-0.3.12/debian/patches/cross.patch volume-key-0.3.12/debian/patches/cross.patch
--- volume-key-0.3.12/debian/patches/cross.patch	1970-01-01 01:00:00.000000000 +0100
+++ volume-key-0.3.12/debian/patches/cross.patch	2024-02-20 09:36:48.000000000 +0100
@@ -0,0 +1,20 @@
+--- volume-key-0.3.12.orig/configure.ac
++++ volume-key-0.3.12/configure.ac
+@@ -62,7 +62,7 @@
+             ;;
+     esac
+     if test "x$__vk_tmp" = x; then
+-        AC_PATH_PROG([PYTHON_CONFIG], [python2-config python-config], [no])
++        AC_PATH_TOOL([PYTHON_CONFIG], [python2-config python-config], [no])
+         if test "x${PYTHON_CONFIG}" = xno; then
+             __vk_tmp=python2-config
+         fi
+@@ -132,7 +132,7 @@
+             ;;
+     esac
+     if test "x$__vk_tmp" = x; then
+-        AC_PATH_PROG([PYTHON3_CONFIG], [python3-config], [no])
++        AC_PATH_TOOL([PYTHON3_CONFIG], [python3-config], [no])
+         if test "x${PYTHON3_CONFIG}" = xno; then
+             __vk_tmp=python3-config
+         fi
diff --minimal -Nru volume-key-0.3.12/debian/patches/series volume-key-0.3.12/debian/patches/series
--- volume-key-0.3.12/debian/patches/series	2022-09-08 01:54:16.000000000 +0200
+++ volume-key-0.3.12/debian/patches/series	2024-02-20 09:36:48.000000000 +0100
@@ -1,2 +1,3 @@
 Revert-Switch-to-gpg2.patch
 Fix-FTBFS-with-Python-3.8.patch
+cross.patch