From 20dd327fab668b3869e53a73d1c4b553e3ccf1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 19 Feb 2018 00:08:37 +0100 Subject: [PATCH] qt5: fix cross build $wrksrc leaking This should finally fix the cross built qt5 packages. --- srcpkgs/qt5/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index da0b127349d..fc1d8457ecb 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.10.1 -revision=3 +revision=4 wrksrc="qt-everywhere-src-${version}" build_style=gnu-configure hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja" @@ -51,13 +51,13 @@ _cleanup_wrksrc_leak() { if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then # Replace references to ${wrksrc} in cmake files sed -i ${PKGDESTDIR}/usr/lib/cmake/*/*.cmake \ - -e "s;${wrksrc}/qtbase/host;/usr/lib/qt5;g" \ + -e "s;${wrksrc}/host;/usr/lib/qt5;g" \ -e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" fi if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then # Replace references to ${wrksrc} in pkgconfig files sed -i ${PKGDESTDIR}/usr/lib/pkgconfig/*.pc \ - -e "s;${wrksrc}/qtbase/host;/usr/lib/qt5;g" \ + -e "s;${wrksrc}/host;/usr/lib/qt5;g" \ -e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" fi # Remove QMAKE_PRL_BUILD_DIR from hint files for static libraries