[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v4 core-updates 29/36] glib: Use a correct python in
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v4 core-updates 29/36] glib: Use a correct python in scripts when cross-compiling. |
Date: |
Sat, 19 Jun 2021 17:04:51 +0200 |
During the build, a native python should be used as these
scripts will be invoked during the build, but when installed,
they should be a python for the system we're compiling for.
* gnu/packages/glib.scm
(glib)[arguments]<#:phases>{patch-python-references}: Look up
"python" in 'native-inputs', not 'inputs'.
(glib)[inputs]{python,python-wrapper,bash-minimal}: New inputs.
---
gnu/packages/glib.scm | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f0be2ddaa4..4f40488df8 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -16,6 +16,7 @@
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Arthur Margerit <ruhtra.mar@gmail.com>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -223,14 +224,19 @@ shared NFS home directories.")
#t))
;; Python references are not being patched in patch-phase of build,
;; despite using python-wrapper as input. So we patch them manually.
+ ;;
+ ;; These python scripts are both used during build and installed,
+ ;; so at first, use a python from 'native-inputs', not 'inputs'. When
+ ;; cross-compiling, the 'patch-shebangs' phase will replace
+ ;; the native python with a python from 'inputs'.
(add-after 'unpack 'patch-python-references
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
(substitute* '("gio/gdbus-2.0/codegen/gdbus-codegen.in"
"glib/gtester-report.in"
"gobject/glib-genmarshal.in"
"gobject/glib-mkenums.in")
(("@PYTHON@")
- (string-append (assoc-ref inputs "python")
+ (string-append (assoc-ref (or native-inputs inputs) "python")
"/bin/python"
,(version-major+minor
(package-version python)))))
@@ -293,6 +299,13 @@ shared NFS home directories.")
("xsltproc" ,libxslt)))
(inputs
`(("bash-completion" ,bash-completion)
+ ;; "python", "python-wrapper" and "bash-minimal"
+ ;; are for the 'patch-shebangs' phase, to make
+ ;; sure the installed scripts end up with a correct shebang
+ ;; when cross-compiling.
+ ("python" ,python)
+ ("python-wrapper" ,python-wrapper)
+ ("bash-minimal" ,(canonical-package bash-minimal))
("dbus" ,dbus)
("libelf" ,libelf)))
(propagated-inputs
--
2.32.0
- [bug#49025] [PATCH v4 core-updates 08/36] libgpg-error: Remove trailing #f from phases., (continued)
- [bug#49025] [PATCH v4 core-updates 08/36] libgpg-error: Remove trailing #f from phases., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 07/36] tzdata: Don't bother with cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 10/36] libgpgerror: Maybe fix a cross-compilation bug., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 11/36] libgpg-error: Fix cross-compilation error., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 13/36] wrap-python3: Make #:builder a G-exp instead of a raw S-exp., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 14/36] wrap-python3: Fix cross-compilation., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 17/36] openssl: Make the #:phases argument a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 24/36] readline: Fix build error when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 30/36] glib: Verify the cross-compiled python is used in installed scripts., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 28/36] fontconfig: Fix build error when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 29/36] glib: Use a correct python in scripts when cross-compiling.,
Maxime Devos <=
- [bug#49025] [PATCH v4 core-updates 19/36] openssl: Move documentation instead of copying and deleting it., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 27/36] fontconfig: Make the #:configure-flags argument a G-expression., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 31/36] glib: Look up "tzdata" in 'native-inputs', not 'inputs'., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 22/36] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 36/36] meson: Support cross-compilation., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 12/36] libgcrypt: Fix cross-compilation build error., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 15/36] python: Fix reference to input when cross-compiling., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 16/36] openssl: Remove trailing #t from phases., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 18/36] openssl: Use G-exp machinery for referring to outputs., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 20/36] openssl: Move all man pages to separate output, not only man3., Maxime Devos, 2021/06/19