From 0d969d4239e252e384bf8fb7de629c4ab63dc142 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Fri, 28 Oct 2016 05:55:47 +0200 Subject: [PATCH] qt5: another fix for cross mkspecs with cmake Closes #5059 --- srcpkgs/qt5/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 173e58c9c04..2fa734541bb 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.6.2 -revision=3 +revision=4 wrksrc="qt-everywhere-opensource-src-${version}" homepage="http://qt.io/" short_desc="A cross-platform application and UI framework (QT5)" @@ -86,7 +86,8 @@ _install_devel() { # Remove QMAKE_PRL_BUILD_DIR from *.prl files because it is the internal builddir find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" -e "/^QMAKE_PRL_BUILD_DIR/d" \; find ${PKGDESTDIR} -iname "*.cmake" -exec sed -i "{}" \ - -e "s;${wrksrc}/qtbase/host/;/usr/lib/qt5/;g" \; + -e "s;${wrksrc}/qtbase/host/;/usr/lib/qt5/;g" \ + -e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" \; } _create_config() { @@ -708,7 +709,8 @@ qt5-devel_package() { # Remove QMAKE_PRL_BUILD_DIR from *.prl files because it is the internal builddir find ${PKGDESTDIR} -iname "*.prl" -exec sed -i "{}" -e "/^QMAKE_PRL_BUILD_DIR/d" \; find ${PKGDESTDIR} -iname "*.cmake" -exec sed -i "{}" \ - -e "s;${wrksrc}/qtbase/host/;/usr/lib/qt5/;g" \; + -e "s;${wrksrc}/qtbase/host/;/usr/lib/qt5/;g" \ + -e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g" \; } }