[PATCH] Orbit2 is broken on core-updates-frozen

DoneSubmitted by Vivien Kraus.
Details
2 participants
  • Maxim Cournoyer
  • Vivien Kraus
Owner
unassigned
Severity
normal
V
V
Vivien Kraus wrote on 9 Nov 2021 15:14
Download
(address . bug-guix@gnu.org)
875yt1s9f2.fsf@planete-kraus.eu
Download
Dear Guix,

orbit2 is a dependency for libreoffice, and it does not build
reproducibly on core-updates-frozen (I don’t know on master). The issue
is well-known, for instance here on Arch:
https://bbs.archlinux.org/viewtopic.php?id=240775

I applied the fix, and it builds with parallel make. What do you think?

Vivien
Download
From 9ba9da5a195a3d863f1c6715349be6c9eea02aeb Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Tue, 9 Nov 2021 15:02:30 +0100
Subject: [PATCH] gnu: orbit2: Fix parallel build.

* gnu/packages/gnome.scm (orbit2)[phases]: Add a phase so that
orbit-name-server-2 depends on libname-server-2.a.
---
gnu/packages/gnome.scm | 8 ++++++++
1 file changed, 8 insertions(+)

Toggle diff (21 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8f6dade3d8..3eafcc2f10 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3627,6 +3627,14 @@ (define-public orbit2
        ;; ... 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"
-- 
2.33.1
Download
-----BEGIN PGP SIGNATURE-----

iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGKglEACgkQO7C8EjLY
uCxcjAwAz0EfhNVI3Oi+yJYogLTvoer7EYBfSC9CCN8C/7dYJXLxiveJcWfvTrpM
7eiboFjU9fXjE3XuZyKcCfcEOLK7ZESJgrQquuTxFpGqVz3LtAEtc9isrptcslgn
Wr00CmTwBJGJt67uUnOomNLvoKhsl816iuoU1BPoYr+z6iysKc24tIFbhovZI/FD
akv0kdNs0t6IMI7hP68sE77jXhKrb7r0IdeLnfMAXust5WZ/MKnCeh+nf1qbOrmv
uT1vtjNvJD+YuiBLS1Jn8iTacuBkVjH24W8QY1mrInuirGTa1M+OHaIZOFgeXS7o
j+AXRVWICsDXaMoUQyRFZWotOFghZnqfb2Pw4H0AngX8wc/CRPBSVgRndCXVvt5d
MDARXiQAn6z9lKpQYtQpzj37CIlGobYzNbbdumpuu708rI1ypuPKaz+BbLIcuhGn
6ulEusV0O+7vmp9rVuwRxlZstp0hB//OT6ZRPi8/++SkJJ3XEKAETfVTMk2UuIVH
Riq769zL
=yZN2
-----END PGP SIGNATURE-----

M
M
Maxim Cournoyer wrote on 12 Nov 2021 04:00
Download
(name . Vivien Kraus)(address . vivien@planete-kraus.eu)(address . 51719-done@debbugs.gnu.org)
87v90yqds1.fsf@gmail.com
Download
Hello Vivien,

Vivien Kraus <vivien@planete-kraus.eu> writes:

Toggle quote (9 lines)
> Dear Guix,
>
> orbit2 is a dependency for libreoffice, and it does not build
> reproducibly on core-updates-frozen (I don’t know on master). The issue
> is well-known, for instance here on Arch:
> https://bbs.archlinux.org/viewtopic.php?id=240775
>
> I applied the fix, and it builds with parallel make. What do you think?

Applied to core-updates-frozen.

Thank you!

Maxim
Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 51719@debbugs.gnu.org