From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] python3-PyQt5: remove rpath
Date: Sun, 07 Feb 2021 17:23:35 +0100 [thread overview]
Message-ID: <20210207162335._4bXU6wtFWP9sn3PXtsth-aIfRXR12zEvbtpTVIGOv4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28562@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages python3-PyQt5-no-rpath
https://github.com/void-linux/void-packages/pull/28562
python3-PyQt5: remove rpath
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/28562.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-PyQt5-no-rpath-28562.patch --]
[-- Type: text/x-diff, Size: 6617 bytes --]
From 613c5bd467db3ebfa5e7bca4259cada9e6c1d160 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 17:31:27 +0700
Subject: [PATCH 1/2] python3-PyQt5: remove rpath
---
srcpkgs/python3-PyQt5/template | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template
index 2a2733b439c..1c819d94bf4 100644
--- a/srcpkgs/python3-PyQt5/template
+++ b/srcpkgs/python3-PyQt5/template
@@ -1,18 +1,17 @@
# Template file for 'python3-PyQt5'
pkgname=python3-PyQt5
version=5.15.2
-revision=2
+revision=3
_sipver=12.8.0
wrksrc="PyQt5-${version}"
build_helper=qemu
-hostmakedepends="pkg-config qscintilla-qt5-devel python3-sip-PyQt5
+hostmakedepends="pkg-config python3-PyQt-builder qt5-host-tools qt5-qmake"
+makedepends="qscintilla-qt5-devel python3-sip-PyQt5
python3-devel python-dbus-devel qt5 qt5-devel qt5-tools-devel
- python3-PyQt-builder
qt5-connectivity-devel qt5-declarative-devel qt5-location-devel
qt5-multimedia-devel qt5-qmake qt5-sensors-devel qt5-serialport-devel
qt5-svg-devel qt5-webchannel-devel qt5-webkit-devel qt5-websockets-devel
qt5-x11extras-devel qt5-xmlpatterns-devel qt5-networkauth-devel pulseaudio-devel"
-makedepends="${hostmakedepends/pkg-config/}"
depends="python3-sip-PyQt5>=${_sipver}"
short_desc="Python 3 bindings for the Qt5 toolkit"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -32,7 +31,7 @@ _cross_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)
@@ -41,6 +40,7 @@ _cross_configure() {
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}
@@ -55,6 +55,7 @@ _cross_configure() {
QMAKE_CFLAGS = ${CFLAGS}
QMAKE_CXXFLAGS = ${CXXFLAGS}
QMAKE_LFLAGS = ${LDFLAGS}
+ INCPATH = $XBPS_CROSS_BASE/usr/include/python$py3_ver
load(qt_config)
_EOF
ln -sf ${XBPS_CROSS_BASE}$qplatformdefs ${wrksrc}/.target-spec/linux-g++/
@@ -62,7 +63,7 @@ _cross_configure() {
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)
@@ -152,14 +153,10 @@ do_configure() {
--build-dir build
if [ "$CROSS_BUILD" ]; then
- # Fix location of libraries
+ # -I/usr/include/python$py3_ver is set by sip-build :(
find build -name Makefile |
xargs sed -i "
- s, \\(/usr/lib/libQt\\), $XBPS_CROSS_BASE\\1,g
- s,-L\\(/usr/lib\\),-L$XBPS_CROSS_BASE\\1,g
- /INSTALL_ROOT/s,$XBPS_CROSS_BASE,,g
s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g
- s,-I\\(/usr/lib\\),-I$XBPS_CROSS_BASE\\1,g
"
fi
}
From e81cab3089f9d4defd152d50156ec1b15cb35d29 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:30:55 +0700
Subject: [PATCH 2/2] python3-PyQt5-webengine: remove rpath
---
srcpkgs/python3-PyQt5-webengine/template | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index ae385283b7f..b0710a6de10 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -1,11 +1,9 @@
# Template file for 'python3-PyQt5-webengine'
pkgname=python3-PyQt5-webengine
version=5.15.2
-revision=1
+revision=2
wrksrc="PyQtWebEngine-${version}"
-hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip qt5-webengine-devel
- python3-PyQt-builder python3-PyQt5-devel
- qt5-declarative-devel qt5-webchannel-devel qt5-location-devel"
+hostmakedepends="pkg-config qt5-qmake python3-PyQt5 sip python3-PyQt-builder"
makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
qt5-webengine-devel python3-devel python3-PyQt5-devel"
depends="python3-PyQt5>=${version}_1 python3-PyQt5-webchannel>=${version}_1"
@@ -33,7 +31,7 @@ _cross_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)
@@ -42,6 +40,7 @@ _cross_configure() {
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}
@@ -56,6 +55,7 @@ _cross_configure() {
QMAKE_CFLAGS = ${CFLAGS}
QMAKE_CXXFLAGS = ${CXXFLAGS}
QMAKE_LFLAGS = ${LDFLAGS}
+ INCPATH = $XBPS_CROSS_BASE/usr/include/python$py3_ver
load(qt_config)
_EOF
ln -sf ${XBPS_CROSS_BASE}$qplatformdefs ${wrksrc}/.target-spec/linux-g++/
@@ -63,7 +63,7 @@ _cross_configure() {
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)
@@ -152,15 +152,9 @@ do_configure() {
--build-dir build
if [ "$CROSS_BUILD" ]; then
- # Fix location of libraries
+ # Fix location of python include
find build -name Makefile |
- xargs sed -i "
- s, \\(/usr/lib/libQt\\), $XBPS_CROSS_BASE\\1,g
- s,-L\\(/usr/lib\\),-L$XBPS_CROSS_BASE\\1,g
- /INSTALL_ROOT/s,$XBPS_CROSS_BASE,,g
- s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g
- s,-I\\(/usr/lib\\),-I$XBPS_CROSS_BASE\\1,g
- "
+ xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
fi
}
next prev parent reply other threads:[~2021-02-07 16:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-07 11:04 [PR PATCH] " sgn
2021-02-07 11:31 ` [PR PATCH] [Updated] " sgn
2021-02-07 16:11 ` sgn
2021-02-07 16:23 ` sgn [this message]
2021-02-08 16:19 ` [PR PATCH] [Updated] " sgn
2021-02-08 16:22 ` sgn
2021-02-09 2:04 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210207162335._4bXU6wtFWP9sn3PXtsth-aIfRXR12zEvbtpTVIGOv4@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).