[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 15/52] gobject-introspection: Fix inputs when cross-c
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 15/52] gobject-introspection: Fix inputs when cross-compiling. |
Date: |
Wed, 25 Aug 2021 20:02:55 +0200 |
* gnu/packages/glib.scm
(gobject-introspection)[native-inputs]: Add 'bison' and 'flex'
when cross-compiling.
(gobject-introspection)[inputs]: Use 'python' instead of 'python-wrapper'
when cross-compiling. Remove 'bison', 'flex' when cross-compiling.
---
gnu/packages/glib.scm | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 060122f42b..ac38cd40d2 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -428,11 +428,19 @@ functions for strings and common data structures.")
#t)))))
(native-inputs
`(("glib" ,glib "bin")
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ;; TODO(core-updates): Unconditionally place "flex" and "bison"
+ ;; in 'native-inputs'.
+ ,@(if (%current-target-system)
+ `(("bison" ,bison)
+ ("flex" ,flex))
+ '())))
(inputs
- `(("bison" ,bison)
- ("flex" ,flex)
- ("python" ,python-wrapper)
+ `(,@(if (%current-target-system)
+ `(("python" ,python))
+ `(("bison" ,bison)
+ ("flex" ,flex)
+ ("python" ,python-wrapper)))
("zlib" ,zlib)))
(propagated-inputs
`(("glib" ,glib)
--
2.33.0
- [bug#50201] [PATCH 14/52] gnu: gobject-introspection: Don't build introspection data when cross-compiling., (continued)
- [bug#50201] [PATCH 14/52] gnu: gobject-introspection: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 19/52] gnu: graphene: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 23/52] gnu: heimdal: Fix inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 05/52] gnu: perl: Find 'bash' when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 13/52] gnu: polkit: Prevent cross-compilation build error., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 18/52] gnu: bdb: Fix cross-compilation build errors., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 25/52] gnu: heimdal: Refer to cross-compiled bash., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 16/52] gobject-introspection: Correct library name when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 11/52] build-system/glib-or-gtk: Support cross-compilaton., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 15/52] gobject-introspection: Fix inputs when cross-compiling.,
Maxime Devos <=
- [bug#50201] [PATCH 21/52] gnu: gamin: Fix 'configure' script when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 24/52] gnu: heimdal: Fix linking error when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 28/52] gnu: heimdal: Use libcom_err from input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 26/52] gnu: heimdal: Use the cross-compiled bash in "su"., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 27/52] gnu: heimdal: Find tools when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 30/52] gnu: json-glib: Find docbook inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 29/52] gnu: json-glib: Add missing 'bash-minimal' input., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 39/52] gnu: at-spi2-core: Add missing "bash-minimal" input., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 41/52] gnu: libxinerama: Add --disable-malloc0-returnsnull when necessary., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 40/52] gnu: xorg: Unify --disable-malloc0-returnsnull code., Maxime Devos, 2021/08/25