[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/19: gnu: xorg: Fix cross-compilation of multiple packages.
From: |
guix-commits |
Subject: |
06/19: gnu: xorg: Fix cross-compilation of multiple packages. |
Date: |
Wed, 3 Jul 2019 10:47:20 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit b349484efb02b5d760bb6b5edfd87bbe38cead67
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 | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 9577c4d..e35e8be 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4546,6 +4546,13 @@ cannot be adequately worked around on the client side of
the wire.")
(base32
"0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m"))))
(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
@@ -4631,6 +4638,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
@@ -5248,9 +5262,14 @@ 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)))
- branch wip-cross-system created (now a4afeb1), guix-commits, 2019/07/03
- 13/19: gnu: libgit2: Fix cross compilation., guix-commits, 2019/07/03
- 02/19: gnu: python: Fix cross compilation., guix-commits, 2019/07/03
- 06/19: gnu: xorg: Fix cross-compilation of multiple packages.,
guix-commits <=
- 15/19: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/07/03
- 07/19: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/07/03
- 10/19: gnu: openssl: Fix cross-compilation., guix-commits, 2019/07/03
- 14/19: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/07/03
- 04/19: gnu: tk: Fix cross-compilation., guix-commits, 2019/07/03
- 03/19: gnu: tcl: Fix cross-compilation., guix-commits, 2019/07/03
- 05/19: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/07/03
- 08/19: gnu: python: Fix cross-compilation., guix-commits, 2019/07/03
- 17/19: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/07/03
- 19/19: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/07/03