From 9e9a2c561d0b66db631671a34e8f96decc9657d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 26 Jan 2021 10:53:36 +0100 Subject: [PATCH] librsvg: fix cross build $XBPS_TARGET_MACHINE is empty when configure_args are expanded. The --host is set by the build style for cross builds anyway. Also remove the vala and gir build options and always build the introspection and vala interface files. Closes: #28234 --- srcpkgs/librsvg/template | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index f8398b9d5ef..3e4954a1332 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -5,12 +5,10 @@ version=2.48.8 revision=1 build_style=gnu-configure build_helper="gir" -configure_args="--disable-static --host=${XBPS_TARGET_TRIPLET} - $(vopt_enable gir introspection) $(vopt_enable vala)" -hostmakedepends="cargo pkg-config python glib-devel - gdk-pixbuf-devel $(vopt_if vala vala)" +configure_args="--disable-static --enable-introspection --enable-vala" +hostmakedepends="cargo pkg-config python glib-devel gdk-pixbuf-devel vala" makedepends="cairo-devel freetype-devel gdk-pixbuf-devel libcroco-devel - libglib-devel libxml2-devel pango-devel rust $(vopt_if vala vala)" + libglib-devel libxml2-devel pango-devel rust vala" short_desc="SVG library for GNOME" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.0-or-later" @@ -18,10 +16,6 @@ homepage="https://wiki.gnome.org/Projects/LibRsvg" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=f480a325bbdf26d1874eb6fb330ebc5920ba64e3e08de61931bb4506dfef2692 -# Package build options -build_options="gir vala" -build_options_default="gir vala" - do_check() { # reference files are for pango 1.44.x, we're on 1.42.x :