* [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling.
@ 2023-11-11 15:30 Zheng Junjie
2023-11-11 16:10 ` Liliana Marie Prikler
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Zheng Junjie @ 2023-11-11 15:30 UTC (permalink / raw)
To: 67108; +Cc: Liliana Marie Prikler, Maxim Cournoyer, Raghav Gururajan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 3518 bytes --]
* gnu/packages/gnome.scm (librsvg-2.40): Fix cross-compiling.
[arguments]<#:configure-flags>: when cross-compiling, disable
gobject-introspection.
[native-inputs]: when cross-compiling, add gdk-pixbuf.
(librsvg-for-system): Use the C version when cross-compiling.
Change-Id: Icb95763422269eed2e067a1d06166c3ed4bdeedc
---
gnu/packages/gnome.scm | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ac3035e07d..c5006993c8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -77,6 +77,7 @@
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3663,7 +3664,10 @@ (define-public librsvg-2.40
"1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags (list "--disable-static")
+ `(#:configure-flags (list "--disable-static"
+ ,@(if (%current-target-system)
+ '("--enable-introspection=no")
+ '()))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
@@ -3674,7 +3678,7 @@ (define-public librsvg-2.40
(("gdk_pixbuf_moduledir = .*$")
(string-append "gdk_pixbuf_moduledir = "
"$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/"
- "loaders\n"))
+ "loaders\n"))
;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg.
(("gdk_pixbuf_cache_file = .*$")
"gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
@@ -3702,9 +3706,12 @@ (define-public librsvg-2.40
"bugs/340047.svg"
"bugs/749415.svg"))))))))
(native-inputs
- (list pkg-config
- `(,glib "bin") ; glib-mkenums, etc.
- gobject-introspection)) ; g-ir-compiler, etc.
+ (append (if (%current-target-system)
+ (list gdk-pixbuf)
+ '())
+ (list pkg-config
+ `(,glib "bin") ; glib-mkenums, etc.
+ gobject-introspection))) ; g-ir-compiler, etc.
(inputs
(list pango libcroco libxml2))
(propagated-inputs
@@ -3714,14 +3721,16 @@ (define-public librsvg-2.40
(properties '((hidden? . #t)))))
(define* (librsvg-for-system #:optional
- (system (or (%current-target-system)
- (%current-system))))
+ (system (%current-system)))
;; Since librsvg 2.50 depends on Rust, and Rust is only correctly supported
;; on x86_64, aarch64 and riscv64 so far, use the ancient C version on other
;; platforms (FIXME).
- (if (supported-package? librsvg)
- librsvg
- librsvg-2.40))
+ ;; and for now cargo-build-system is no support cross-compiling, so when
+ ;; cross-compiling we just use C version.
+ (if (or (%current-target-system)
+ (not (supported-package? librsvg system)))
+ librsvg-2.40
+ librsvg))
(export librsvg-for-system)
base-commit: af6105afc67a15a491a0a4fd18a28c9f801a0b94
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling.
2023-11-11 15:30 [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling Zheng Junjie
@ 2023-11-11 16:10 ` Liliana Marie Prikler
2023-11-12 8:19 ` [bug#67108] [PATCH v2] " Zheng Junjie
2023-12-21 9:28 ` bug#67108: [PATCH] " Efraim Flashner
2 siblings, 0 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2023-11-11 16:10 UTC (permalink / raw)
To: Zheng Junjie, 67108; +Cc: Raghav Gururajan, Maxim Cournoyer
Am Samstag, dem 11.11.2023 um 23:30 +0800 schrieb Zheng Junjie:
> * gnu/packages/gnome.scm (librsvg-2.40): Fix cross-compiling.
> [arguments]<#:configure-flags>: when cross-compiling, disable
> gobject-introspection.
When.
> [native-inputs]: when cross-compiling, add gdk-pixbuf.
When.
> (librsvg-for-system): Use the C version when cross-compiling.
You don't need a newline here afaik.
> Change-Id: Icb95763422269eed2e067a1d06166c3ed4bdeedc
> ---
> gnu/packages/gnome.scm | 29 +++++++++++++++++++----------
> 1 file changed, 19 insertions(+), 10 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index ac3035e07d..c5006993c8 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -77,6 +77,7 @@
> ;;; Copyright © 2023 Juliana Sims <juli@incana.org>
> ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
> ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
> +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -3663,7 +3664,10 @@ (define-public librsvg-2.40
>
> "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))
> (build-system gnu-build-system)
> (arguments
> - `(#:configure-flags (list "--disable-static")
> + `(#:configure-flags (list "--disable-static"
> + ,@(if (%current-target-system)
> + '("--enable-introspection=no")
> + '()))
Can we do --disable-introspection?
> #:phases
> (modify-phases %standard-phases
> (add-before 'configure 'pre-configure
> @@ -3674,7 +3678,7 @@ (define-public librsvg-2.40
> (("gdk_pixbuf_moduledir = .*$")
> (string-append "gdk_pixbuf_moduledir = "
> "$(prefix)/lib/gdk-pixbuf-
> 2.0/2.10.0/"
> - "loaders\n"))
> + "loaders\n"))
> ;; Drop the 'loaders.cache' file, it's in gdk-
> pixbuf+svg.
> (("gdk_pixbuf_cache_file = .*$")
> "gdk_pixbuf_cache_file =
> $(TMPDIR)/loaders.cache\n"))
> @@ -3702,9 +3706,12 @@ (define-public librsvg-2.40
> "bugs/340047.svg"
> "bugs/749415.svg"))))))))
> (native-inputs
> - (list pkg-config
> - `(,glib "bin") ; glib-mkenums, etc.
> - gobject-introspection)) ; g-ir-compiler, etc.
> + (append (if (%current-target-system)
> + (list gdk-pixbuf)
> + '())
> + (list pkg-config
> + `(,glib "bin") ; glib-mkenums, etc.
> + gobject-introspection))) ; g-ir-compiler, etc.
Instead of doing append, you can quasiquote the list and use ,@ to
splice in gdk-pixbuf.
> (inputs
> (list pango libcroco libxml2))
> (propagated-inputs
> @@ -3714,14 +3721,16 @@ (define-public librsvg-2.40
> (properties '((hidden? . #t)))))
>
> (define* (librsvg-for-system #:optional
> - (system (or (%current-target-system)
> - (%current-system))))
> + (system (%current-system)))
Why this change?
> ;; Since librsvg 2.50 depends on Rust, and Rust is only correctly
> supported
> ;; on x86_64, aarch64 and riscv64 so far, use the ancient C
> version on other
> ;; platforms (FIXME).
> - (if (supported-package? librsvg)
> - librsvg
> - librsvg-2.40))
> + ;; and for now cargo-build-system is no support cross-compiling,
> so when
> + ;; cross-compiling we just use C version.
> + (if (or (%current-target-system)
> + (not (supported-package? librsvg system)))
> + librsvg-2.40
> + librsvg))
This hunk LGTM.
Cheers
^ permalink raw reply [flat|nested] 4+ messages in thread* [bug#67108] [PATCH v2] gnu: librsvg-2.40: Fix cross-compiling.
2023-11-11 15:30 [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling Zheng Junjie
2023-11-11 16:10 ` Liliana Marie Prikler
@ 2023-11-12 8:19 ` Zheng Junjie
2023-12-21 9:28 ` bug#67108: [PATCH] " Efraim Flashner
2 siblings, 0 replies; 4+ messages in thread
From: Zheng Junjie @ 2023-11-12 8:19 UTC (permalink / raw)
To: 67108; +Cc: Liliana Marie Prikler, Maxim Cournoyer, Raghav Gururajan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2689 bytes --]
* gnu/packages/gnome.scm (librsvg-2.40): Fix cross-compiling.
[arguments]<#:configure-flags>: When cross-compiling, disable
gobject-introspection.
[native-inputs]: When cross-compiling, add gdk-pixbuf.
(librsvg-for-system): Use the C version when cross-compiling.
Change-Id: Icb95763422269eed2e067a1d06166c3ed4bdeedc
---
gnu/packages/gnome.scm | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ac3035e07d..b832ff1099 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -77,6 +77,7 @@
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw>
;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com>
+;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3663,7 +3664,10 @@ (define-public librsvg-2.40
"1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags (list "--disable-static")
+ `(#:configure-flags (list "--disable-static"
+ ,@(if (%current-target-system)
+ '("--disable-introspection")
+ '()))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
@@ -3702,9 +3706,12 @@ (define-public librsvg-2.40
"bugs/340047.svg"
"bugs/749415.svg"))))))))
(native-inputs
- (list pkg-config
- `(,glib "bin") ; glib-mkenums, etc.
- gobject-introspection)) ; g-ir-compiler, etc.
+ `(,pkg-config
+ ,@(if (%current-target-system)
+ (list gdk-pixbuf)
+ '())
+ (,glib "bin") ; glib-mkenums, etc.
+ ,gobject-introspection)) ; g-ir-compiler, etc.
(inputs
(list pango libcroco libxml2))
(propagated-inputs
@@ -3719,9 +3726,12 @@ (define* (librsvg-for-system #:optional
;; Since librsvg 2.50 depends on Rust, and Rust is only correctly supported
;; on x86_64, aarch64 and riscv64 so far, use the ancient C version on other
;; platforms (FIXME).
- (if (supported-package? librsvg)
- librsvg
- librsvg-2.40))
+ ;; and for now cargo-build-system is no support cross-compiling, so when
+ ;; cross-compiling we just use C version.
+ (if (or (%current-target-system)
+ (not (supported-package? librsvg system)))
+ librsvg-2.40
+ librsvg))
(export librsvg-for-system)
base-commit: af6105afc67a15a491a0a4fd18a28c9f801a0b94
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* bug#67108: [PATCH] gnu: librsvg-2.40: Fix cross-compiling.
2023-11-11 15:30 [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling Zheng Junjie
2023-11-11 16:10 ` Liliana Marie Prikler
2023-11-12 8:19 ` [bug#67108] [PATCH v2] " Zheng Junjie
@ 2023-12-21 9:28 ` Efraim Flashner
2 siblings, 0 replies; 4+ messages in thread
From: Efraim Flashner @ 2023-12-21 9:28 UTC (permalink / raw)
To: Zheng Junjie
Cc: Raghav Gururajan, 67108-done, Liliana Marie Prikler,
Maxim Cournoyer
[-- Attachment #1: Type: text/plain, Size: 687 bytes --]
On Sat, Nov 11, 2023 at 11:30:24PM +0800, Zheng Junjie wrote:
> * gnu/packages/gnome.scm (librsvg-2.40): Fix cross-compiling.
> [arguments]<#:configure-flags>: when cross-compiling, disable
> gobject-introspection.
> [native-inputs]: when cross-compiling, add gdk-pixbuf.
>
> (librsvg-for-system): Use the C version when cross-compiling.
With the rust-team branch merged there's now support for cross-compiling
librsvg so this patch shouldn't be needed anymore.
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-21 9:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-11 15:30 [bug#67108] [PATCH] gnu: librsvg-2.40: Fix cross-compiling Zheng Junjie
2023-11-11 16:10 ` Liliana Marie Prikler
2023-11-12 8:19 ` [bug#67108] [PATCH v2] " Zheng Junjie
2023-12-21 9:28 ` bug#67108: [PATCH] " Efraim Flashner
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).