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 86523a99e061d5689f712a38f8ba5ab69f4c365d..1cd3168ac9646b374f3de12b3a74ffb028f03db2 100644 (file)
--- 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 1b79603c3ecbe80b0669a1daef0c6fbcc3a38a84..c967204271e4c815d0012c1ed7ae251c917d57f9 100755 (executable)
--- 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