unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#58488] [PATCH] gnu: gnome: Include aarch64 in librsvg-for-system.
@ 2022-10-13 10:20 Christopher Baines
  2022-10-23 13:10 ` Ludovic Courtès
  2022-11-03 15:32 ` Ludovic Courtès
  0 siblings, 2 replies; 4+ messages in thread
From: Christopher Baines @ 2022-10-13 10:20 UTC (permalink / raw)
  To: 58488

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))
       librsvg
       librsvg-2.40))
 
-- 
2.37.3





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#58488] [PATCH] gnu: gnome: Include aarch64 in librsvg-for-system.
  2022-10-13 10:20 [bug#58488] [PATCH] gnu: gnome: Include aarch64 in librsvg-for-system Christopher Baines
@ 2022-10-23 13:10 ` Ludovic Courtès
  2022-11-03 15:32 ` Ludovic Courtès
  1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2022-10-23 13:10 UTC (permalink / raw)
  To: Christopher Baines; +Cc: 58488

Hi Chris,

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.

[...]

> +  ;; 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’.




^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#58488] [PATCH] gnu: gnome: Include aarch64 in librsvg-for-system.
  2022-10-13 10:20 [bug#58488] [PATCH] gnu: gnome: Include aarch64 in librsvg-for-system Christopher Baines
  2022-10-23 13:10 ` Ludovic Courtès
@ 2022-11-03 15:32 ` Ludovic Courtès
  2022-11-03 16:46   ` bug#58488: " Christopher Baines
  1 sibling, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2022-11-03 15:32 UTC (permalink / raw)
  To: Christopher Baines; +Cc: 58488

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?

Ludo’.




^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#58488: [PATCH] gnu: gnome: Include aarch64 in librsvg-for-system.
  2022-11-03 15:32 ` Ludovic Courtès
@ 2022-11-03 16:46   ` Christopher Baines
  0 siblings, 0 replies; 4+ messages in thread
From: Christopher Baines @ 2022-11-03 16:46 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 58488-done

[-- Attachment #1: Type: text/plain, Size: 1363 bytes --]


Ludovic Courtès <ludo@gnu.org> writes:

> 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-11-03 16:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-13 10:20 [bug#58488] [PATCH] gnu: gnome: Include aarch64 in librsvg-for-system Christopher Baines
2022-10-23 13:10 ` Ludovic Courtès
2022-11-03 15:32 ` Ludovic Courtès
2022-11-03 16:46   ` bug#58488: " Christopher Baines

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).