[PATCH] gnu: gnome: Include aarch64 in librsvg-for-system.

  • Done
  • quality assurance status badge
Details
2 participants
  • Ludovic Courtès
  • Christopher Baines
Owner
unassigned
Submitted by
Christopher Baines
Severity
normal

Debbugs page

Christopher Baines wrote 2 years ago
(address . guix-patches@gnu.org)
20221013102048.22966-1-mail@cbaines.net
Since the staging merge, librsvg has been buildable for aarch64.

* gnu/packages/gnome.scm (librsvg-for-system): Use librsvg for aarch64.
---
gnu/packages/gnome.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 09a991b14c..ff9d95c244 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3753,8 +3753,10 @@ (define* (librsvg-for-system #:optional
(system (or (%current-target-system)
(%current-system))))
;; Since librsvg 2.50 depends on Rust, and Rust is only correctly supported
- ;; on x86_64 so far, use the ancient C version on other platforms (FIXME).
- (if (string-prefix? "x86_64-" system)
+ ;; on x86_64 and aarch64 so far, use the ancient C version on other
+ ;; platforms (FIXME).
+ (if (or (string-prefix? "x86_64-" system)
+ (string-prefix? "aarch64-" system))
librsvg
librsvg-2.40))
--
2.37.3
Ludovic Courtès wrote 2 years ago
(name . Christopher Baines)(address . mail@cbaines.net)(address . 58488@debbugs.gnu.org)
8735be4rex.fsf@gnu.org
Hi Chris,

Christopher Baines <mail@cbaines.net> skribis:

Toggle quote (4 lines)
> Since the staging merge, librsvg has been buildable for aarch64.
>
> * gnu/packages/gnome.scm (librsvg-for-system): Use librsvg for aarch64.

[...]

Toggle quote (7 lines)
> + ;; on x86_64 and aarch64 so far, use the ancient C version on other
> + ;; platforms (FIXME).
> + (if (or (string-prefix? "x86_64-" system)
> + (string-prefix? "aarch64-" system))
> librsvg
> librsvg-2.40))

Looks like a reasonable workaround to me. Go for it!

Thanks,
Ludo’.
Ludovic Courtès wrote 2 years ago
(name . Christopher Baines)(address . mail@cbaines.net)(address . 58488@debbugs.gnu.org)
874jvgoxxw.fsf@gnu.org
Christopher Baines <mail@cbaines.net> skribis:

Toggle quote (22 lines)
> Since the staging merge, librsvg has been buildable for aarch64.
>
> * gnu/packages/gnome.scm (librsvg-for-system): Use librsvg for aarch64.
> ---
> gnu/packages/gnome.scm | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 09a991b14c..ff9d95c244 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -3753,8 +3753,10 @@ (define* (librsvg-for-system #:optional
> (system (or (%current-target-system)
> (%current-system))))
> ;; Since librsvg 2.50 depends on Rust, and Rust is only correctly supported
> - ;; on x86_64 so far, use the ancient C version on other platforms (FIXME).
> - (if (string-prefix? "x86_64-" system)
> + ;; on x86_64 and aarch64 so far, use the ancient C version on other
> + ;; platforms (FIXME).
> + (if (or (string-prefix? "x86_64-" system)
> + (string-prefix? "aarch64-" system))

With https://issues.guix.gnu.org/58661 now fixed, I think you can go
ahead and push this one, no?

Ludo’.
Christopher Baines wrote 2 years ago
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 58488-done@debbugs.gnu.org)
87bkpom1ed.fsf@cbaines.net
Ludovic Courtès <ludo@gnu.org> writes:

Toggle quote (27 lines)
> Christopher Baines <mail@cbaines.net> skribis:
>
>> Since the staging merge, librsvg has been buildable for aarch64.
>>
>> * gnu/packages/gnome.scm (librsvg-for-system): Use librsvg for aarch64.
>> ---
>> gnu/packages/gnome.scm | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
>> index 09a991b14c..ff9d95c244 100644
>> --- a/gnu/packages/gnome.scm
>> +++ b/gnu/packages/gnome.scm
>> @@ -3753,8 +3753,10 @@ (define* (librsvg-for-system #:optional
>> (system (or (%current-target-system)
>> (%current-system))))
>> ;; Since librsvg 2.50 depends on Rust, and Rust is only correctly supported
>> - ;; on x86_64 so far, use the ancient C version on other platforms (FIXME).
>> - (if (string-prefix? "x86_64-" system)
>> + ;; on x86_64 and aarch64 so far, use the ancient C version on other
>> + ;; platforms (FIXME).
>> + (if (or (string-prefix? "x86_64-" system)
>> + (string-prefix? "aarch64-" system))
>
> With <https://issues.guix.gnu.org/58661> now fixed, I think you can go
> ahead and push this one, no?

Indeed, thanks for the reminder, I've pushed to master as
754f260753fb6ebe28325616bc08336a184e4621.

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

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmNj8GpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XfdEhAAs6k37blnGRM18+dzqqFYPlQhOTNvIYah
sTw4RGKFvr2Aaeg8LE2lhYt83RlaovLFt/0MxXU2+S8auW91Xx6fAguN+xTmUI91
vrUZvpWu9jBi09ft2DRemmmfapPt4MSQLIFKMMosYD8epG8johlhzjA3zXfBVzAP
NehTzv+ag851qSaVH/IYhJ29gXpiOCNJlwwuJj4O0+YFJ78QW6Q0QNvBamLQMNAE
E7jjaTV0FAuZynDa8lRJaZXCRKAMQO3ejRldlPjAFgQlrWxvqWjMHZG9diei017v
dO2tj9VHwr7uXhcrVtHS+/iMbUPc82u3LK4pmbjRIwcxEcN2nTYBoOl9Ov6ejrFR
sMWBsbbENGCRiMVuzGtUE6c9fKlUieRdoLEXKtdFeokX7t/KybGlgpi9gMndvqkE
FIzqluySOTVaWkuuLJoITvUmP4/4rWBcDhDztkbpq7DZm6Y8i8Pwy3GsIrGLSwFT
corZ+Wo88HT2Tjh3RtlgmF6gLLqKIcrVWGRCsYEW4QPOwhZ5tnlyFqeMe6iVcied
n63IGi73UW3GVwZ8TMtfiBBUhsGoc9oRZ/jMl2DjyNb1vUQRN1Q3rUq34XTyCb0V
1tLgZJcKvBWqSWpJb4rZFtpFRCpIJcaEQV5d1UtwdYnZIW3gG4q9nJonkM5SstPd
CWmENIffFCU=
=+/xt
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

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

To respond to this issue using the mumi CLI, first switch to it
mumi current 58488
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help