From: Marius Bakke <mbakke@fastmail.com>
To: 38405-done@debbugs.gnu.org
Subject: bug#38405: [PATCH] gnu: qtbase: Use absolute references in .prl files.
Date: Thu, 28 Nov 2019 00:18:13 +0100 [thread overview]
Message-ID: <87o8ww7vt6.fsf@devup.no> (raw)
In-Reply-To: <20191127181128.19365-1-mbakke@fastmail.com>
[-- Attachment #1: Type: text/plain, Size: 939 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> This fixes <https://bugs.gnu.org/38405>.
>
> * gnu/packages/qt.scm (qtbase)[arguments]: Add phase 'patch-prl-files'.
[...]
> + (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)))
I pushed this hunk in a59e2dd8cd16655e379abb567baf978c94f3d48e, as I'm
fairly confident that this is the right thing to do.
Feedback still welcome however. :-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2019-11-27 23:19 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 ` bug#38405: [PATCH] gnu: qtbase: Use absolute references in .prl files Marius Bakke
2019-11-27 23:18 ` Marius Bakke [this message]
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=87o8ww7vt6.fsf@devup.no \
--to=mbakke@fastmail.com \
--cc=38405-done@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).