This is an automated email from the git hooks/post-receive script.
lfam pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 9c69fec gnu: gnome-builder: Fix the build.
9c69fec is described below
commit 9c69fec08e286f7486e64c2aa3110fa34974d15d
Author: Leo Prikler <[email protected]>
AuthorDate: Thu Sep 10 20:26:10 2020 +0200
gnu: gnome-builder: Fix the build.
As reported in #43296, gnome-builder tries to be linked against the static
version of libselinux (propagated through glib/gio), failing to do so, as it
also wants to be a PIE. To keep the PIE, link it against the dynamic
library.
Fixes <https://bugs.gnu.org/43296>.
* gnu/packages/gnome.scm (gnome-builder)[arguments]: Add 'fix-ninja' phase.
Signed-off-by: Leo Famulari <[email protected]>
---
gnu/packages/gnome.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b8a2c38..cd7bc0c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11797,6 +11797,13 @@ libraries. Applications do not need to be
recompiled--or even restarted.")
(string-append (assoc-ref inputs "python-pygobject")
"/lib")))
#t))
+ (add-after 'configure 'fix-ninja
+ (lambda _
+ ;; #43296: meson(?) incorrectly assumes we want to link
+ ;; this PIE against a static libselinux.
+ (substitute* "build.ninja"
+ (("libselinux\\.a") "libselinux.so"))
+ #t))
(add-before 'check 'pre-check
(lambda _
(system "Xvfb :1 &")
