Re: [PR PATCH] [Updated] build-style/qmake: no rpath

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 372 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages qmake-no-rpath
https://github.com/void-linux/void-packages/pull/28563

build-style/qmake: no rpath
Fix #27494

- Not sure if RPATH is intentional or not?

A patch file from https://github.com/void-linux/void-packages/pull/28563.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qmake-no-rpath-28563.patch --]
[-- Type: text/x-diff, Size: 2199 bytes --]

From 48503dbc25ae12b01cd65c48991993dbd9f2a84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 18:05:17 +0700
Subject: [PATCH 1/2] build-style/qmake: no rpath

Fix #27494
---
 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 fa54c005f36..2795d77d372 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 b584516f1e123f2b1c80f34a210373093294f75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 23:24:31 +0700
Subject: [PATCH 2/2] build-style/qmake: look for modules in target

- With this added, we can remove qt5*-devel from hostmakedepends
---
 common/build-style/qmake.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-style/qmake.sh b/common/build-style/qmake.sh
index 2795d77d372..b979ea33469 100644
--- a/common/build-style/qmake.sh
+++ b/common/build-style/qmake.sh
@@ -37,6 +37,7 @@ include(/usr/lib/qt5/mkspecs/common/g++-unix.conf)
 
 QMAKE_TARGET_CONFIG     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qconfig.pri
 QMAKE_TARGET_MODULE     = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/qmodule.pri
+QMAKEMODULES            = ${XBPS_CROSS_BASE}/usr/lib/qt5/mkspecs/modules
 QMAKE_CC                = ${CC}
 QMAKE_CXX               = ${CXX}
 QMAKE_LINK              = ${CXX}