[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49025] [PATCH v6 19/22] glib: Verify the cross-compiled python is u
From: |
Maxime Devos |
Subject: |
[bug#49025] [PATCH v6 19/22] glib: Verify the cross-compiled python is used in installed scripts. |
Date: |
Wed, 14 Jul 2021 13:13:04 +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 99f5c5d450..e4ebed7e2c 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 v6 03/22] utils: Give 'target-mingw?' a docstring., (continued)
- [bug#49025] [PATCH v6 08/22] libgpg-error: Remove trailing #f from phases., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 10/22] libgpg-error: Fix cross-compilation error., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 12/22] openssl: Remove trailing #t from phases., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 19/22] glib: Verify the cross-compiled python is used in installed scripts.,
Maxime Devos <=
- [bug#49025] [PATCH v6 01/22] utils: Define 'target-linux?' predicate., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 04/22] utils: Define a target-x86-32? and target-x86-64? predicate., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 11/22] python: Fix reference to input when cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 18/22] glib: Use a correct python in scripts when cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 20/22] glib: Look up "tzdata" in 'native-inputs', not 'inputs'., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 07/22] tzdata: Don't bother with cross-compiling., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 06/22] net-base: Don't cross-compile., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 09/22] libgpg-error: Prevent silent miscompilation some systems., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 13/22] openssl: Make the #:phases argument a G-expression., Maxime Devos, 2021/07/14
- [bug#49025] [PATCH v6 16/22] openssl: Move all man pages to separate output, not only man3., Maxime Devos, 2021/07/14