From: Marius Bakke <mbakke@fastmail.com>
To: 38405@debbugs.gnu.org
Subject: bug#38405: [PATCH] gnu: qtbase: Use absolute references in .prl files.
Date: Wed, 27 Nov 2019 19:11:28 +0100 [thread overview]
Message-ID: <20191127181128.19365-1-mbakke@fastmail.com> (raw)
In-Reply-To: <87r21t6vos.fsf@devup.no>
This fixes <https://bugs.gnu.org/38405>.
* gnu/packages/qt.scm (qtbase)[arguments]: Add phase 'patch-prl-files'.
---
gnu/packages/qt.scm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5f4f29a948..2cc44ab831 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -509,6 +509,16 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(("\\$\\$\\[QT_HOST_DATA/get\\]") archdata)
(("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))
#t)))
+ (add-after 'patch-mkspecs 'patch-prl-files
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; Insert absolute references to the qtbase libraries because
+ ;; QT_INSTALL_LIBS does not always resolve correctly, depending
+ ;; on context. See <https://bugs.gnu.org/38405>
+ (substitute* (find-files (string-append out "/lib") "\\.prl$")
+ (("\\$\\$\\[QT_INSTALL_LIBS\\]")
+ (string-append out "/lib")))
+ #t)))
(add-after 'unpack 'patch-paths
;; Use the absolute paths for dynamically loaded libs, otherwise
;; the lib will be searched in LD_LIBRARY_PATH which typically is
--
2.24.0
next prev parent reply other threads:[~2019-11-27 18:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 18:06 bug#38405: [staging] Some Qt plugins fail to build Marius Bakke
2019-11-27 18:11 ` Marius Bakke [this message]
2019-11-27 23:18 ` bug#38405: [PATCH] gnu: qtbase: Use absolute references in .prl files Marius Bakke
2019-11-28 10:26 ` Efraim Flashner
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191127181128.19365-1-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=38405@debbugs.gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).