[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/35: gnu: xorg: Fix cross-compilation of multiple packages.
From: |
guix-commits |
Subject: |
07/35: gnu: xorg: Fix cross-compilation of multiple packages. |
Date: |
Thu, 10 Oct 2019 11:33:15 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit d7c53647323963ec656852a5b967f3e3792b99c3
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 b3d9fd3..d7cd585 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 core-updates created (now 4d14902), guix-commits, 2019/10/10
- 02/35: gnu: perl: Fix cross-compilation., guix-commits, 2019/10/10
- 05/35: gnu: tk: Fix cross-compilation., guix-commits, 2019/10/10
- 06/35: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/10/10
- 01/35: gnu: bash: Unconditionally configure PGRP_PIPE for *-linux systems., guix-commits, 2019/10/10
- 04/35: gnu: tcl: Fix cross-compilation., guix-commits, 2019/10/10
- 07/35: gnu: xorg: Fix cross-compilation of multiple packages.,
guix-commits <=
- 34/35: gnu: libtool: Fix cross-compilation., guix-commits, 2019/10/10
- 08/35: gnu: python: Further cross-compilation fixes., guix-commits, 2019/10/10
- 16/35: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/10/10
- 30/35: gnu: procps: Fix cross-compilation., guix-commits, 2019/10/10
- 29/35: gnu: nghttp2: Fix cross-compilation., guix-commits, 2019/10/10
- 09/35: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/10/10
- 03/35: gnu: python: Fix cross compilation., guix-commits, 2019/10/10
- 10/35: gnu: libgit2: Fix cross compilation., guix-commits, 2019/10/10
- 17/35: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/10/10
- 11/35: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/10/10