[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: libxt: Fix cross-compilation.
From: |
guix-commits |
Subject: |
01/02: gnu: libxt: Fix cross-compilation. |
Date: |
Thu, 26 Dec 2019 12:15:59 -0500 (EST) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit adf218e2e8d855ca9c8477658478658939ed2107
Author: Mathieu Othacehe <address@hidden>
Date: Thu Dec 26 17:55:43 2019 +0100
gnu: libxt: Fix cross-compilation.
* gnu/packages/xorg.scm (libxt)[arguments]: Pass
--disable-malloc0returnsnull
configure flag when cross-compiling.
---
gnu/packages/xorg.scm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 801e5e4..b379212 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5411,10 +5411,15 @@ draggable titlebars and borders.")
(outputs '("out"
"doc")) ;2 MiB of man pages + XML
(arguments
- '(#:configure-flags (list (string-append "--mandir="
- (assoc-ref %outputs "doc")
- "/share/man")
- "--disable-static")))
+ `(#:configure-flags
+ (list (string-append "--mandir="
+ (assoc-ref %outputs "doc")
+ "/share/man")
+ "--disable-static"
+ ;; Disable zero malloc check that fails when cross-compiling.
+ ,@(if (%current-target-system)
+ '("--disable-malloc0returnsnull")
+ '()))))
(propagated-inputs
`(("libx11" ,libx11)
("libice" ,libice)