From b6501476aec4c5d86769eb8f0a10db07a6caeeb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 28 Apr 2019 17:36:53 +0200 Subject: [PATCH] build-helper/gir: provide host gtk+3-devel if required When cross building a package using build_helper="gir" add the gtk+3-devel package to the hostmakedepends in case it is contained in the makedepends. Remove the specific case in gcr now that this is automatic. --- common/build-helper/gir.sh | 5 +++++ srcpkgs/gcr/template | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/build-helper/gir.sh b/common/build-helper/gir.sh index 63c22929c5..075eaeef1d 100644 --- a/common/build-helper/gir.sh +++ b/common/build-helper/gir.sh @@ -23,5 +23,10 @@ if [ "$build_option_gir" ] || [[ $build_options != *"gir"* ]]; then # Provide basic .gir types like GLib, GObject, DBus, Gio, cairo # and tooling like g-ir-compiler makedepends+=" gobject-introspection" + + # Provide gtk+3-devel in the host if it is in the makedepends + if [[ $makedepends == *"gtk+3-devel"* ]]; then + hostmakedepends+=" gtk+3-devel" + fi fi fi diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index 11abb8171a..dbb40327dd 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -22,10 +22,6 @@ checksum=95204aa2111c301778ebfbe60975ce3ed698c958430ffcc2a785ac5e593d168b build_options="gir vala" build_options_default="gir vala" -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" gtk+3-devel" -fi - do_check() { # requires X11 server :