moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

qt5: fix cross build $wrksrc leaking

Browse source 
This should finally fix the cross built qt5 packages.
This commit is contained in:
Jürgen Buchmüller 2018-02-19 00:08:37 +01:00
parent 087c3ef05a
commit 20dd327fab
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/qt5/template
View file

@ -1,7 +1,7 @@
# Template file for 'qt5' # Template file for 'qt5'
pkgname=qt5 pkgname=qt5
version=5.10.1 version=5.10.1
revision=3 revision=4
wrksrc="qt-everywhere-src-${version}" wrksrc="qt-everywhere-src-${version}"
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="flex ruby gperf git python perl pkg-config protobuf re2c ninja" 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 if [ -d "${PKGDESTDIR}/usr/lib/cmake" ]; then
# Replace references to ${wrksrc} in cmake files # Replace references to ${wrksrc} in cmake files
sed -i ${PKGDESTDIR}/usr/lib/cmake/*/*.cmake \ 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" -e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
fi fi
if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then if [ -d "${PKGDESTDIR}/usr/lib/pkgconfig" ]; then
# Replace references to ${wrksrc} in pkgconfig files # Replace references to ${wrksrc} in pkgconfig files
sed -i ${PKGDESTDIR}/usr/lib/pkgconfig/*.pc \ 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" -e "s;devices/void-${XBPS_CROSS_TRIPLET}-g++;linux-g++;g"
fi fi
# Remove QMAKE_PRL_BUILD_DIR from hint files for static libraries # Remove QMAKE_PRL_BUILD_DIR from hint files for static libraries