From: Simon McVittie <smcv@debian.org>
Date: Sun, 31 Dec 2023 15:34:21 +0000 (+0000)
Subject: d/control, d/rules: Enable cross-compilation
X-Git-Tag: archive/raspbian/2023.8-2+rpi1^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0922b6199053f9bd16ab84a003f48f7aeaaaa8fc;p=ostree.git

d/control, d/rules: Enable cross-compilation

When cross-compiling, this requires a version of gobject-introspection
that is currently only available in experimental. When not
cross-compiling, the version in testing is sufficient.
---

diff --git a/debian/control b/debian/control
index 86523a99..1cd3168a 100644
--- a/debian/control
+++ b/debian/control
@@ -20,10 +20,12 @@ Build-Depends:
  docbook-xsl <!nodoc>,
  libext2fs-dev,
  elfutils,
- fuse3,
- gjs [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
+ fuse3:native,
+ gir1.2-gio-2.0-dev,
+ gjs:native [!alpha !hppa !ia64 !m68k !sh4 !sparc64 !x32],
  gnupg <!nocheck>,
  gobject-introspection,
+ gobject-introspection (>= 1.78.1-7~) <cross>,
  gtk-doc-tools <!nodoc>,
  libarchive-dev,
  libattr1-dev,
@@ -32,7 +34,6 @@ Build-Depends:
  libcap-dev,
  libcurl4-gnutls-dev | libcurl-dev,
  libfuse3-dev,
- libgirepository1.0-dev,
  libglib2.0-dev,
  libgpgme-dev,
  liblzma-dev,
diff --git a/debian/rules b/debian/rules
index 1b79603c..c9672042 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,12 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- $(configure_options)
 
+override_dh_auto_build:
+	# The upstream build system overrides this to gcc as a way to avoid
+	# passing unsupported options to clang, but that's wrong for
+	# cross-builds
+	dh_auto_build -- INTROSPECTION_SCANNER_ENV="CC=$(DEB_HOST_GNU_TYPE)-gcc"
+
 override_dh_auto_test-arch:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	chmod +x tests/test-pull-bareuseronly.sh