From 15b0456150d524a6687fa76773d6852d744531b3 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 5 Apr 2019 05:19:18 +0200 Subject: [PATCH] gobject-introspection: change qemuwrapper to use XBPS_TARGET_QEMU_MACHINE --- .../files/g-ir-scanner-qemuwrapper | 18 +----------------- srcpkgs/gobject-introspection/template | 2 +- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/srcpkgs/gobject-introspection/files/g-ir-scanner-qemuwrapper b/srcpkgs/gobject-introspection/files/g-ir-scanner-qemuwrapper index cec66702d08..ad45ddc03c2 100755 --- a/srcpkgs/gobject-introspection/files/g-ir-scanner-qemuwrapper +++ b/srcpkgs/gobject-introspection/files/g-ir-scanner-qemuwrapper @@ -3,23 +3,7 @@ # which may then get deleted (or their dependencies) and potentially segfault export GIO_MODULE_DIR=${XBPS_CROSS_BASE}/gio/modules-dummy -case "$XBPS_TARGET_MACHINE" in - x86_64*) _MACHINE=x86_64 ;; - i686) _MACHINE=i386 ;; - aarch64*) _MACHINE=aarch64 ;; - armv*) _MACHINE=arm ;; - mipsel*) _MACHINE=mipsel ;; - mips*) _MACHINE=mips ;; - ppc64le*) _MACHINE=ppc64le ;; - ppc64*) _MACHINE=ppc64 ;; - ppc*) _MACHINE=ppc ;; - *) - echo "unknown qemu architecture: $XBPS_TARGET_MACHINE" - exit 1 - ;; -esac - -/usr/bin/qemu-${_MACHINE}-static \ +/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static \ -L ${XBPS_CROSS_BASE} \ -E LD_LIBRARY_PATH="${XBPS_CROSS_BASE}/usr/lib:.libs:${GIR_EXTRA_LIBS_PATH}" \ "$@" diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index 07d0abbe16b..554aba27d5a 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -1,7 +1,7 @@ # Template file for 'gobject-introspection' pkgname=gobject-introspection version=1.60.0 -revision=1 +revision=2 build_style=meson pycompile_dirs="usr/lib/${pkgname}/giscanner" hostmakedepends="flex pkg-config"