[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v4 core-updates 30/36] glib: Verify the cross-compile
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v4 core-updates 30/36] glib: Verify the cross-compiled python is used in installed scripts. |
Date: |
Sat, 19 Jun 2021 17:04:52 +0200 |
* gnu/packages/glib.scm (glib)[arguments]<#:disallowed-references>:
Disallow the native python when cross-compiling.
---
gnu/packages/glib.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 4f40488df8..22bd384fa7 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -77,6 +77,8 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
+ #:use-module (guix gexp)
+ #:use-module (srfi srfi-26)
#:use-module ((srfi srfi-1) #:hide (zip))
;; Export variables up-front to allow circular dependency with the 'xorg'
@@ -200,7 +202,15 @@ shared NFS home directories.")
"static" ;static libraries
"bin")) ;executables; depends on Python
(arguments
- `(#:disallowed-references (,tzdata-for-tests)
+ `(#:disallowed-references
+ (,tzdata-for-tests
+ ;; Verify glib-mkenums, gtester, ... use the cross-compiled
+ ;; python.
+ ,@(if (%current-target-system)
+ (map (cut gexp-input <> #:native? #t)
+ `(,(this-package-native-input "python")
+ ,(this-package-native-input "python-wrapper")))
+ '()))
#:configure-flags '("--default-library=both"
"-Dman=true"
"-Dselinux=disabled")
--
2.32.0
- [bug#49025] [PATCH v4 core-updates 06/36] net-base: Don't cross-compile., (continued)
- [bug#49025] [PATCH v4 core-updates 06/36] net-base: Don't cross-compile., Maxime Devos, 2021/06/19
- [bug#49025] [PATCH v4 core-updates 03/36] packages: Define this-package-input and this-package-native-input., Maxime Devos, 2021/06/19
- [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 <=
- [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, 2021/06/19
- [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