Skip to content

Improve multiarch and ability to cross-compile

Simon McVittie requested to merge wip/smcv/cross into master
  • Revert "Build-Depends: gobject-introspection --> gobject-introspection-bin"

    As shown in its Description, gobject-introspection-bin is an implementation detail and is not intended to be depended on directly.

    This reverts commit 16ce503c.

    Fixes Lintian tag: missing-build-dependency-for-dh-addon gir
    Closes: #1094604

  • Add patch from Helmut Grohne to use host architecture pkg-config

    Fixes Lintian tag: autotools-pkg-config-macro-not-cross-compilation-safe
    Closes: #1061247

  • d/control: Add ${gir:Depends}, ${gir:Provides} to -dev package

    As suggested by dh_girepository warning messages during the build.

    ${gir:Depends} ensures that loading GIR XML files in this package will not fail because GIR XML that they depend on is missing.

    ${gir:Provides} allows other packages to depend on Gsf-1.gir by its systematic name gir1.2-gsf-1-dev.

  • d/control: Add gir1.2-*-dev Build-Depends as suggested by dh_girepository

    These systematic virtual package names correspond exactly to the Gsf_1_gir_INCLUDES in the upstream build system. Explicitly build-depending on these means we no longer need to build-depend on libgirepository1.0-dev, which for historical reasons cannot be multiarch-friendly.

  • d/rules: Don't build or install HTML docs with nodoc build option

    In addition to removing a source of non-reproducibility which can break multi-arch co-installation (#814502), when combined with previous changes this is enough to make it possible to cross-compile libgsf for a foreign architecture, as long as DEB_BUILD_OPTIONS includes nodoc and a version of qemu-user that emulates the host architecture is available.

    Mitigates: #814502

  • d/control, d/rules: Enable GIR dh sequence declaratively

    This makes it easier to disable under specific build configurations. In fact we only need this sequence when building architecture-dependent packages, so move it to Build-Depends-Arch.


/cc @onlyjob @helmutg

Merge request reports

Loading