From f4ffbb31abe1c5c8dcb62421317428a8388ddd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 7 Feb 2021 18:05:17 +0700 Subject: [PATCH 1/2] build-style/qmake: no rpath See #27494 Close #28563 --- common/build-style/qmake.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh index fa54c005f36f55..2795d77d3725d0 100644 --- a/common/build-style/qmake.sh +++ b/common/build-style/qmake.sh @@ -28,7 +28,7 @@ do_configure() { mkdir -p "${wrksrc}/.target-spec/linux-g++" cat > "${wrksrc}/.target-spec/linux-g++/qmake.conf" <<_EOF MAKEFILE_GENERATOR = UNIX -CONFIG += incremental +CONFIG += incremental no_qt_rpath QMAKE_INCREMENTAL_STYLE = sublib include(/usr/lib/qt5/mkspecs/common/linux.conf) @@ -58,7 +58,7 @@ _EOF mkdir -p "${wrksrc}/.host-spec/linux-g++" cat > "${wrksrc}/.host-spec/linux-g++/qmake.conf" <<_EOF MAKEFILE_GENERATOR = UNIX -CONFIG += incremental +CONFIG += incremental no_qt_rpath QMAKE_INCREMENTAL_STYLE = sublib include(/usr/lib/qt5/mkspecs/common/linux.conf) From 3aa586a151e532b2f7b082586b42ce132dcf5ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 7 Feb 2021 22:56:19 +0700 Subject: [PATCH 2/2] qt5: clean $wrksrc leak on cross --- srcpkgs/qt5/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 16cf68980753e5..ea494f4b129b10 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 version=5.15.2 -revision=1 +revision=2 wrksrc="qt-everywhere-src-${version}" build_style=meta hostmakedepends="cmake clang flex perl glib-devel pkg-config @@ -314,6 +314,7 @@ do_install() { make -f Makefile.target ${makejobs} ln -sf ../lib/qt5/bin/qmake ${PKGDESTDIR}/usr/bin/qmake-qt5 cp -ar ${wrksrc}/qtbase/mkspecs ${PKGDESTDIR}/usr/lib/qt5 + _cleanup_wrksrc_leak # # Build qmldevtools for the target