[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/64: gnu: xorg: Fix cross-compilation of multiple packages.
From: |
guix-commits |
Subject: |
06/64: gnu: xorg: Fix cross-compilation of multiple packages. |
Date: |
Fri, 23 Aug 2019 04:10:15 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 3a1dc36e1afaaa918735a28a10091f7c1ebc3e3e
Author: Mathieu Othacehe <address@hidden>
Date: Wed Jun 26 18:43:22 2019 +0200
gnu: xorg: Fix cross-compilation of multiple packages.
* gnu/packages/xorg.scm (libxext)[arguments]: Disable zero malloc check that
fails when cross-compiling,
(libxrender)[arguments]: ditto,
(libx11)[arguments]: ditto.
---
gnu/packages/xorg.scm | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index e4848b7..aa89daf 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4552,6 +4552,13 @@ cannot be adequately worked around on the client side of
the wire.")
(base32
"0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"))))
(build-system gnu-build-system)
+ ;; Disable zero malloc check that fails when cross-compiling.
+ (arguments
+ `(#:configure-flags
+ (list
+ ,@(if (%current-target-system)
+ '("--disable-malloc0returnsnull")
+ '()))))
(propagated-inputs
`(("xorgproto" ,xorgproto)))
(inputs
@@ -4637,6 +4644,13 @@ cannot be adequately worked around on the client side of
the wire.")
(base32
"0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"))))
(build-system gnu-build-system)
+ ;; Disable zero malloc check that fails when cross-compiling.
+ (arguments
+ `(#:configure-flags
+ (list
+ ,@(if (%current-target-system)
+ '("--disable-malloc0returnsnull")
+ '()))))
(propagated-inputs
`(("xorgproto" ,xorgproto)))
(inputs
@@ -5245,16 +5259,22 @@ draggable titlebars and borders.")
(outputs '("out"
"doc")) ;8 MiB of man pages + XML
(arguments
- '(#:configure-flags (list (string-append "--mandir="
- (assoc-ref %outputs "doc")
- "/share/man"))))
+ `(#:configure-flags
+ (list (string-append "--mandir="
+ (assoc-ref %outputs "doc")
+ "/share/man")
+ ;; Disable zero malloc check that fails when cross-compiling.
+ ,@(if (%current-target-system)
+ '("--disable-malloc0returnsnull")
+ '()))))
(propagated-inputs
`(("xorgproto" ,xorgproto)
("libxcb" ,libxcb)))
(inputs
`(("xtrans" ,xtrans)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ("xorgproto" ,xorgproto)))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg Core X11 protocol client library")
(description "Xorg Core X11 protocol client library.")
- branch wip-cross-system created (now a5d9ed2), guix-commits, 2019/08/23
- 06/64: gnu: xorg: Fix cross-compilation of multiple packages.,
guix-commits <=
- 04/64: gnu: tk: Fix cross-compilation., guix-commits, 2019/08/23
- 01/64: gnu: perl: Fix cross-compilation., guix-commits, 2019/08/23
- 02/64: gnu: python: Fix cross compilation., guix-commits, 2019/08/23
- 07/64: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/08/23
- 17/64: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/08/23
- 19/64: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 26/64: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/08/23
- 20/64: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 25/64: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/08/23
- 22/64: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/08/23