[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/145: gnu: glib: Fix cross-compilation.
From: |
guix-commits |
Subject: |
26/145: gnu: glib: Fix cross-compilation. |
Date: |
Mon, 10 Jan 2022 11:44:03 -0500 (EST) |
apteryx pushed a commit to branch version-1.4.0
in repository guix.
commit e7613b136ded687787580e4f998dfa4ae1050891
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Dec 17 21:20:28 2021 -0500
gnu: glib: Fix cross-compilation.
Fixes <https://issues.guix.gnu.org/52574>.
Reported by L p R n d n <guix@lprndn.info>.
Thanks to Maxime Devos for the suggested fix.
* gnu/packages/glib.scm (glib)[configure-flags]: Define as a G-expression.
(glib-with-documentation)[configure-flags]: Likewise.
---
gnu/packages/glib.scm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 4868db832d..ade4eb32aa 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -212,12 +212,11 @@ shared NFS home directories.")
`(,(this-package-native-input "python")
,(this-package-native-input "python-wrapper")))
'()))
- #:configure-flags (list "--default-library=both"
- "-Dman=false"
- "-Dselinux=disabled"
- (string-append "--bindir="
- (assoc-ref %outputs "bin")
- "/bin"))
+ #:configure-flags ,#~(list "--default-library=both"
+ "-Dman=false"
+ "-Dselinux=disabled"
+ (string-append "--bindir="
+ #$output:bin "/bin"))
#:phases
(modify-phases %standard-phases
;; Needed to pass the test phase on slower ARM and i686 machines.
@@ -365,8 +364,8 @@ functions for strings and common data structures.")
(arguments
(substitute-keyword-arguments (package-arguments glib)
((#:configure-flags flags ''())
- `(cons "-Dgtk_doc=true"
- (delete "-Dman=false" ,flags)))
+ #~(cons "-Dgtk_doc=true"
+ (delete "-Dman=false" #$flags)))
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-docbook-xml
- 13/145: gnu: avahi: Make all arguments unconditional., (continued)
- 13/145: gnu: avahi: Make all arguments unconditional., guix-commits, 2022/01/10
- 05/145: gnu: python-wheel: Update to 0.37.0., guix-commits, 2022/01/10
- 04/145: gnu: python-packaging-bootstrap: Update to 21.3., guix-commits, 2022/01/10
- 03/145: gnu: mesa: Update to 21.3.2., guix-commits, 2022/01/10
- 07/145: gnu: python-tomli: Update to 2.0.0., guix-commits, 2022/01/10
- 14/145: gnu: autoconf-2.69: Repatriate unpatch-shebangs phase from 2.71., guix-commits, 2022/01/10
- 11/145: utils: Fix wrap-script argument handling., guix-commits, 2022/01/10
- 12/145: gnu: python-3.9: Update to 3.9.9., guix-commits, 2022/01/10
- 19/145: gnu: gobject-introspection: Unconditionally use flex and bison., guix-commits, 2022/01/10
- 22/145: gnu: cairo: Use bash-minimal unconditionally., guix-commits, 2022/01/10
- 26/145: gnu: glib: Fix cross-compilation.,
guix-commits <=
- 31/145: gnu: glibmm-2.64: Fix libsigc++ propagation., guix-commits, 2022/01/10
- 24/145: gnu: libcap: Use #$output unconditionally., guix-commits, 2022/01/10
- 41/145: gnu: gsettings-desktop-schemas: Add python to native inputs., guix-commits, 2022/01/10
- 35/145: gnu: cmake-bootstrap: Update to 3.21.4., guix-commits, 2022/01/10
- 10/145: gnu: Remove meson-0.59 workarounds., guix-commits, 2022/01/10
- 06/145: gnu: python-pyparsing: Update to 3.0.6., guix-commits, 2022/01/10
- 09/145: gnu: meson: Update to 0.60.2 and absorb meson-wrapped., guix-commits, 2022/01/10
- 16/145: gnu: binutils: Absorb binutils-next., guix-commits, 2022/01/10
- 18/145: gnu: rust-bitflags-1: Absorb rust-bitflags-1.3., guix-commits, 2022/01/10
- 29/145: gnu: pciutils: Fix the conditional for the kmod input., guix-commits, 2022/01/10