[PATCH] gnu: rust-1.19: Don't include i686-linux in supported-systems.

DoneSubmitted by Christopher Baines.
Details
2 participants
  • Chris Marusich
  • Christopher Baines
Owner
unassigned
Severity
normal
C
C
Christopher Baines wrote on 7 Mar 2021 14:34
(address . guix-patches@gnu.org)
20210307133406.17656-1-mail@cbaines.net
Currently rust fails to build for i686-linux, so this will avoid computing
lots of derivations that depend on rust, but won't be possible to build.

* gnu/packages/rust.scm (rust-1.19)[supported-systems]: Switch hardcoding only
supporting x86_64-linux for supporting all supported systems, other than
i686-linux.
---
gnu/packages/rust.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (17 lines)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 98a6bfffa5..1fc540f0f8 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -453,7 +453,9 @@ test = { path = \"../libtest\" }
             (variable "LIBRARY_PATH")
             (files '("lib" "lib64")))))
 
-    (supported-systems '("x86_64-linux"))
+    (supported-systems
+     (delete "i686-linux"               ; fails to build, see #35519
+             %supported-systems))
     (synopsis "Compiler for the Rust programming language")
     (description "Rust is a systems programming language that provides memory
 safety and thread safety guarantees.")
-- 
2.30.1
C
C
Chris Marusich wrote on 8 Mar 2021 03:53
Re: core-updates: Emacs is only supported on x86_64-linux?
(address . guix-devel@gnu.org)
874khm5pab.fsf_-_@gmail.com
Hi all,

FYI, I'm sending this message to 46987@debbugs.gnu.org via Bcc, also.
I'm not sure if that works, but we'll see...

Mark H Weaver <mhw@netris.org> writes:

Toggle quote (3 lines)
> It's not intended. Emacs should certainly be supported on every system
> that Guix supports.

Thank you for confirming. That is what I expected.

Toggle quote (31 lines)
> For now, I suggest that Emacs should have input 'librsvg' only on
> 'x86_64-linux' systems. Something like this (untested), for
> core-updates:
>
> diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
> index 98061c93ae..de6101cf17 100644
> --- a/gnu/packages/emacs.scm
> +++ b/gnu/packages/emacs.scm
> @@ -71,6 +71,7 @@
> #:use-module (gnu packages xml)
> #:use-module (gnu packages xorg)
> #:use-module (guix utils)
> + #:use-module (ice-9 match)
> #:use-module (srfi srfi-1))
>
> (define-public emacs
> @@ -236,7 +237,10 @@
> ("libpng" ,libpng)
> ("zlib" ,zlib)
>
> - ("librsvg" ,librsvg)
> + ,@(match (or (%current-target-system)
> + (%current-system))
> + ("x86_64-linux" `(("librsvg" ,librsvg)))
> + (_ `()))
> ("libxpm" ,libxpm)
> ("libxml2" ,libxml2)
> ("libice" ,libice)
>
> Ditto for all other packages with 'librsvg' as an optional dependency.

I've confirmed that works for emacs, except that you actually have to
also do it for gtk+, too, since rust gets pulled in via gtk+ also. So,
something like this:
From 649c89e5862e1ed887f5fd863ef7bb32f97bbe74 Mon Sep 17 00:00:00 2001
From: Chris Marusich <cmmarusich@gmail.com>
Date: Sun, 7 Mar 2021 17:42:37 -0800
Subject: [PATCH] gnu: emacs: Use librsvg and gtk+ on x86_64-linux only.

* gnu/packages/emacs.scm (emacs)[inputs]: Only add librsvg when the
%current-target-system or %current-system is "x86_64-linux". This avoids
pulling rust into the transitive closure of inputs on systems where Rust
support is currently lacking.
---
gnu/packages/emacs.scm | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

Toggle diff (47 lines)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 98061c93ae0..f0797ae2347 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -71,6 +71,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
   #:use-module (guix utils)
+  #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
 
 (define-public emacs
@@ -219,7 +220,6 @@
 
        ;; TODO: Add the optional dependencies.
        ("libx11" ,libx11)
-       ("gtk+" ,gtk+)
        ("cairo" ,cairo)
        ("pango" ,pango)
        ("harfbuzz" ,harfbuzz)
@@ -236,7 +236,6 @@
        ("libpng" ,libpng)
        ("zlib" ,zlib)
 
-       ("librsvg" ,librsvg)
        ("libxpm" ,libxpm)
        ("libxml2" ,libxml2)
        ("libice" ,libice)
@@ -246,7 +245,15 @@
 
        ;; multilingualization support
        ("libotf" ,libotf)
-       ("m17n-lib" ,m17n-lib)))
+       ("m17n-lib" ,m17n-lib)
+
+       ;; These are optional dependencies that pull in rust.  Rust is not
+       ;; supported well on every architecture yet.
+       ,@(match (or (%current-target-system)
+                    (%current-system))
+           ("x86_64-linux" `(("gtk+" ,gtk+)
+                             ("librsvg" ,librsvg)))
+           (_ '()))))
     (native-inputs
      `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
        ("pkg-config" ,pkg-config)
-- 
2.26.2
What do you think about that? If there are no problems, I'll go ahead
and commit it to core-updates.

Note that because that patch re-orders the inputs, it causes emacs to be
rebuilt, which should be fine because it's core-updates. It seemed
better to group these two inputs in a single match clause, rather than
scattering them in two different but basically identical match clauses
just to keep their original ordering intact.

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (18 lines)
> Chris Marusich <cmmarusich@gmail.com> writes:
>
>> I've noticed that the emacs package only supports x86_64-linux, at least
>> on core-updates. Is that intended?
>
> The relevant commit [1] does mention the intent "Remove "i686-linux"
> from supported systems.", but that does differ from my interpretation of
> the change, which is only support x86_64-linux.
>
> 1: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=0ed631866cc0b7cece2b0a0b50e39b37ae91bb67
>
> I've sent a patch that should add back "support" for other systems:
>
> https://issues.guix.gnu.org/46987
>
> That's for master at least, I haven't looked in to what the situation is
> on core-updates. It's worth there checking if the build still fails.

That patch doesn't apply on core-updates because that rust version
doesn't seem to exist any more on core-updates. However, the same
change applied to the right rust on core-updates does the trick, like
this:
From e36c4cab40c5b97ffedc72acc586c0b560e7868e Mon Sep 17 00:00:00 2001
From: Chris Marusich <cmmarusich@gmail.com>
Date: Sun, 7 Mar 2021 15:58:19 -0800
Subject: [PATCH] gnu: rust: Make it "supported" on all systems but i686-linux.

* gnu/packages/rust.scm (rust-1.30)[supported-systems]: Instead of hard-coding
this to just "x86_64-linux", calculate the supported systems by deleting
"i686-linux" from %supported-systems.
---
gnu/packages/rust.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Toggle diff (17 lines)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 70d19e089ab..98c553cb913 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -448,7 +448,9 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\"
            (search-path-specification
             (variable "LIBRARY_PATH")
             (files '("lib" "lib64")))))
-    (supported-systems '("x86_64-linux"))
+    (supported-systems
+     (delete "i686-linux"  ; fails to build, see bug #35519
+             %supported-systems))
     (synopsis "Compiler for the Rust progamming language")
     (description "Rust is a systems programming language that provides memory
 safety and thread safety guarantees.")
-- 
2.26.2
Both of these patches fix the issue for me. After applying either one
in isolation (on the wip-ppc64le branch, which was recently rebased onto
core-updates), the list of supported systems for the emacs package
correctly includes other systems, including powerpc64le-linux, and thus
the tests/guix-package.sh test passes on my powerpc64le-linux system.

I think both of these patches are important and needed. The patch to
restore supported systems to the rust package is important because we
will want rust to build successfully on many systems. The patch to only
add gtk+ and librsvg inputs to emacs when the system is x86_64-linux is
important because it would be advantageous to be able to use emacs
without depending on rust on systems like powerpc64le-linux, where Rust
support may not be great yet.

It's also convenient for me, personally, because I don't really want to
deal with Rust right now just to get Emacs working on powerpc64le-linux.
Once I can build a Guix release binary for powerpc64le-linux, then I
think I can start worrying more about Rust. I have taken the liberty of
applying these patches to the wip-ppc64le branch as-is, since they work
for me. I can remove them later if we don't like it.

We will undoubtedly run into a similar situation with other packages
going forward, like Mark mentioned. Debian ran into this very issue
some time ago, and apparently it caused a bit of consternation:


Apparently, powerpc64le-unknown-linux-gnu is a "Tier 2" Rust platform,
which I guess means it's pretty well supported, but not as well as "Tier
1". I hope that we can get it all working, since librsvg is depended
upon in some way or another by about 2700 packages (about 17% of the
total Guix package collection). In the meantime, limiting the blast
radius as needed, like Mark suggested, seems like the right thing to do
until Rust support improves on other architectures.

--
Chris
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAmBFkbwACgkQ3UCaFdgi
Rp3vSQ//dSixq85AcEjmw4TCw/zO0v9RWUZkP66C+jSW2818guy77II0twuo/r77
VGoyg5c9a1S0fZCYLnECrllC7DXSAOHX2VnOrzoQJoJO3auKCxGGsB9yca0Seiow
Od7iBswYqUpbY21ByE8tKL+NfKOv+ED4EK+SY6FJwXRK73xefLUYJzUmDymyoKym
akcOo0GBLk8DBkuGVAa0qkBYuLr/CaCwYHBOBf/zF78syeHJm9wkgVt1bt/00ecQ
4yOGgAntTFZGyJ9AlFmumBCEsBjOnL1jpa5ws+h0TZB4qVfi5jJUoLOmvTYUYMbs
egElKvHOVCeZ0SmJi7FmR3Wka0iRXSyw0KKQMWPsQTcDIpqIX2eUnmAPXX+P6GbN
HJbxxH6oGSUqdbx/UoLHzfRxuDvuI70/YR46hdMPzpI2ZfQfNUqF0aoifjxLckoW
41c/bI4ybBvi5dHlNnZj5Y2wPwjodbhYIDucJW71qkxh4TlM1Wb5rT9W4bEHXztk
J2UV3LaUWs9aXf1Q/lceV99hvj/17TiK3o0kto69x5o366+6uygRnsmk3OeW+UMF
1nGJieixWMJyMdWlTEjcLx91iW4OBn8TPAV1ctyNP/Le1oVQJRKlCsa5LhsPCp61
PQ2fSEVwqLlU7UNtWv3XLhWqbOpK8zchYtLxZaGTgj4h/POPrDA=
=bqac
-----END PGP SIGNATURE-----

C
C
Christopher Baines wrote on 8 Mar 2021 23:35
Re: [bug#46987] [PATCH] gnu: rust-1.19: Don't include i686-linux in supported-systems.
(address . 46987-done@debbugs.gnu.org)
87eegpb7ev.fsf@cbaines.net
Christopher Baines <mail@cbaines.net> writes:

Toggle quote (26 lines)
> Currently rust fails to build for i686-linux, so this will avoid computing
> lots of derivations that depend on rust, but won't be possible to build.
>
> * gnu/packages/rust.scm (rust-1.19)[supported-systems]: Switch hardcoding only
> supporting x86_64-linux for supporting all supported systems, other than
> i686-linux.
> ---
> gnu/packages/rust.scm | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
> index 98a6bfffa5..1fc540f0f8 100644
> --- a/gnu/packages/rust.scm
> +++ b/gnu/packages/rust.scm
> @@ -453,7 +453,9 @@ test = { path = \"../libtest\" }
> (variable "LIBRARY_PATH")
> (files '("lib" "lib64")))))
>
> - (supported-systems '("x86_64-linux"))
> + (supported-systems
> + (delete "i686-linux" ; fails to build, see #35519
> + %supported-systems))
> (synopsis "Compiler for the Rust programming language")
> (description "Rust is a systems programming language that provides memory
> safety and thread safety guarantees.")

I've gone ahead and pushed this to master as
f5c6e6966c020722700ef0343ab0a6030e2d61b5.
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmBGprhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xea0hAAhfUrJPew8IARrJkXw0Yy23XwsXTYbjoW
5XeyZK8NPXbDIGi6KzQKg5G0BiIX4fV9qJFmYvoRkigedMUIBIjYO/IyMRpflVV1
pxyqdnth2yfQq1g9R0ZPgE8o/rQcn4ZyR0Tc9pZTG2F+SBNLxqYrTM7sVpv75SNm
xulnYyYGZ78eWvAKqzE3qQc2mmdKMHMHy+NZngwKtZN5vQhpKFg1na9WSet1erEt
Z15HX6u0pivD+uENq2SG/Bw5N7caJs5mm/ehKH4cuHqssC5k6zMiZHxckoRd7UW1
7c6wwvTusnBoo7LM9qFvQ/MC06gsS8dCsTL7FnvJnasjHOXHzdrewmhaO63B/JPp
2B2HZlWk+pCjz7HILKgqQT9UCTRBKdcfqXVk/f77BPADOsRotGT8j8mvePnejCO4
vB9LeObUzDQ+/x4H0BIZ/IEICy69MXDmD8RbDPqwVLK7/tCc0eCdbGsU5+igVygZ
cUVeTL5RZHEA6n2m+K5KOp/ex0bkES7BTA+EtXqQA6l9YABN92PbM/46DreNYWRi
POvJZWyNIjAX9C5LIC2Wz6+tldP0rjz1jCBuI5rLrHVQPDGyox5DmKr7jtI5OzlD
0nakcokP9oF5CXl6DS33lDNgYzDtbsFXaY+ICq17VewmED7QW0WHfseyoNTVm5Ly
0wuSQCaTYoc=
=JhN1
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

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