[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates-frozen updated: gnu: orbit2: Fix parallel build.
From: |
guix-commits |
Subject: |
branch core-updates-frozen updated: gnu: orbit2: Fix parallel build. |
Date: |
Thu, 11 Nov 2021 21:59:53 -0500 |
This is an automated email from the git hooks/post-receive script.
apteryx pushed a commit to branch core-updates-frozen
in repository guix.
The following commit(s) were added to refs/heads/core-updates-frozen by this
push:
new 9273d83 gnu: orbit2: Fix parallel build.
9273d83 is described below
commit 9273d83bc3b1b3c1925c01f8fddde794d7b55025
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Tue Nov 9 15:02:30 2021 +0100
gnu: orbit2: Fix parallel build.
* gnu/packages/gnome.scm (orbit2): Remove trailing #t.
[phases]: Add a phase so that orbit-name-server-2 depends on
libname-server-2.a.
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
gnu/packages/gnome.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 80266b1..2321b5a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3636,11 +3636,19 @@ functionality was designed to be as reusable and
portable as possible.")
;; ... which they then completly ignore !!
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-parallel-build
+ ;; Parallel build fails because of a failed dependency,
+ ;; https://bugzilla.gnome.org/show_bug.cgi?id=732274
+ (lambda _
+ (substitute* "src/services/name/Makefile.am"
+ (("orbit_name_server_2_DEPENDENCIES = \\$(DEPS) CosNaming.h")
+ "orbit_name_server_2_DEPENDENCIES = \
+$(DEPS) CosNaming.h libname-server-2.a"))))
(add-before 'configure 'ignore-deprecations
(lambda _
(substitute* "linc2/src/Makefile.in"
- (("-DG_DISABLE_DEPRECATED")
"-DGLIB_DISABLE_DEPRECATION_WARNINGS"))
- #t)))))
+ (("-DG_DISABLE_DEPRECATED")
+ "-DGLIB_DISABLE_DEPRECATION_WARNINGS")))))))
(inputs `(("glib" ,glib)
("libidl" ,libidl)))
(native-inputs
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates-frozen updated: gnu: orbit2: Fix parallel build.,
guix-commits <=