From d1ad03a3c4b1445a08b9c8f377303da06cd2a8a8 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 May 2020 17:09:08 +0200 Subject: [PATCH] gimp: fix cross builds gimp was calling pkg-config assuming that it won't be a wrapper for cross builds, which resulted in cross flags getting leaked into native tools. --- srcpkgs/gimp/template | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index c9f735a541b..4c5b31c3291 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -21,14 +21,12 @@ checksum=65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716 python_version=2 #unverified lib32disabled=yes -case "$XBPS_TARGET_MACHINE" in - arm*) nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/24795/steps/shell_3/logs/stdio" ;; -esac - pre_configure() { NOCONFIGURE=1 autoreconf -fi if [ "$CROSS_BUILD" ]; then sed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure + rm "${XBPS_WRAPPERDIR}/pkg-config" + export PKG_CONFIG="${XBPS_WRAPPERDIR}/${XBPS_CROSS_TRIPLET}-pkg-config" fi }