[Android-tools-devel] Bug#1057725: android-platform-system-extras FTCBFS: uses the build architecture pkg-config

[Helmut Grohne]

Source: android-platform-system-extras
Version: 10.0.0+r36+ds-2.1
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs

android-platform-system-extras fails to cross build from source, because
debian/rules hard codes the build architecture pkg-config. I'm attaching
a patch for your convenience.

Helmut
-------------- next part --------------
diff --minimal -Nru android-platform-system-extras-10.0.0+r36+ds/debian/changelog android-platform-system-extras-10.0.0+r36+ds/debian/changelog
--- android-platform-system-extras-10.0.0+r36+ds/debian/changelog	2023-01-18 16:40:05.000000000 +0100
+++ android-platform-system-extras-10.0.0+r36+ds/debian/changelog	2023-12-07 14:46:11.000000000 +0100
@@ -1,3 +1,10 @@
+android-platform-system-extras (10.0.0+r36+ds-2.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use the host pkg-config. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Thu, 07 Dec 2023 14:46:11 +0100
+
 android-platform-system-extras (10.0.0+r36+ds-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru android-platform-system-extras-10.0.0+r36+ds/debian/rules android-platform-system-extras-10.0.0+r36+ds/debian/rules
--- android-platform-system-extras-10.0.0+r36+ds/debian/rules	2023-01-18 16:39:59.000000000 +0100
+++ android-platform-system-extras-10.0.0+r36+ds/debian/rules	2023-12-07 14:46:09.000000000 +0100
@@ -2,11 +2,13 @@
 
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/pkg-info.mk
+-include /usr/share/dpkg/buildtools.mk
+PKG_CONFIG ?= pkg-config
 
 # Security Hardening
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -fPIC
-export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/android -DNDEBUG `pkg-config --cflags squashfuse`
+export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/android -DNDEBUG `$(PKG_CONFIG) --cflags squashfuse`
 export OUT_DIR = debian/out
 
 lib%.so: debian/lib%.mk