[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/61: gnu: xorg: Fix cross-compilation of multiple packages.
From: |
guix-commits |
Subject: |
06/61: gnu: xorg: Fix cross-compilation of multiple packages. |
Date: |
Wed, 21 Aug 2019 04:24:49 -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 74d4056), guix-commits, 2019/08/21
- 04/61: gnu: tk: Fix cross-compilation., guix-commits, 2019/08/21
- 06/61: gnu: xorg: Fix cross-compilation of multiple packages.,
guix-commits <=
- 11/61: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/08/21
- 12/61: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/21
- 10/61: gnu: openssl: Fix cross-compilation., guix-commits, 2019/08/21
- 09/61: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/08/21
- 07/61: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/08/21
- 14/61: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/08/21
- 08/61: gnu: python: Further cross-compilation fixes., guix-commits, 2019/08/21
- 01/61: gnu: perl: Fix cross-compilation., guix-commits, 2019/08/21
- 03/61: gnu: tcl: Fix cross-compilation., guix-commits, 2019/08/21
- 02/61: gnu: python: Fix cross compilation., guix-commits, 2019/08/21