From patchwork Mon Jul 8 09:58:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14508 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D3DB171D4; Mon, 8 Jul 2019 11:00:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CC251171D2 for ; Mon, 8 Jul 2019 11:00:18 +0100 (BST) Received: from localhost ([::1]:39994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRW-0005CW-F1 for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:00:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54756) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRP-00057F-Gj for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRO-00033f-7F for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRO-00033Y-1d for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRN-0004tG-UA for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 06/31] gnu: xorg: Fix cross-compilation of multiple packages. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2019 10:00:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156257998018407 (code B ref 36477); Mon, 08 Jul 2019 10:00:09 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:40 +0000 Received: from localhost ([127.0.0.1]:57792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQt-0004mc-0u for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:39 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:40003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQp-0004kr-Bx for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:35 -0400 Received: by mail-wm1-f49.google.com with SMTP id v19so15685474wmj.5 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HQChGiapUc/V6LTOFWQ6u7G33P+LMpP/E3ipLTuUPF4=; b=id//RtAb3CW/GxloDCUHCznGE6jFyUJh4mr1aLdxFpy/zlWduyHKTFnUFPTi/7xyC3 fokEcx6McmZRIhJzjQHVJAL2jUEPNGSi/vM6DeWngOVjgBfwFMsJsUbEgI7HfVwqAHM9 HKhNpmIz/SJ0VF6pHNogd/DEIXi7jdOE1zfYqfhbqQ+VTwfZSWECRun0V9gIICQx9apQ hMrQlmmhutNCFZTsFgHw4uV1hlmSR9OYYKyBVNhazIl2yBLrMkqkQmCJ+LQnHiW0+FBW M1cJZDeELTXCJeNI64Vdc7rQYrY7+poWuUg0L20qR6drWX2e6OslYDsH+qU0110Rmj0o vZAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HQChGiapUc/V6LTOFWQ6u7G33P+LMpP/E3ipLTuUPF4=; b=eOH7uLsXnMjYXgvX21HVg9ZtWWcQFUGxff1U6hmi06YzrBrzrXzfEmgLqNp0K/6tKE /uBEB0FEEZEskINxNCU99S2IltCk5JybmjM1Qq5QTEvCwQO+xAv80tynxLjC7vw/d8Y9 u6IzVZsdeRmTD8bUyOgH4CPFKF6MPXD21Q3Bi5Xz7bn5FX3ojxUy6uskR8tTjWnz/IdY TUaam1toCvXhwwDj83vhFWGmB8nusJDcqBrtDXAGReL/RSJTn4WY5YIYf7Ic5uf0n0RF I8l354P6VkkC0gV1l46zZK4VjdmJw0DNzBzXvfJhFKVhLZfw4pLq2czOPZAzBtgEozRL LaFA== X-Gm-Message-State: APjAAAUOBY1oLrCFd340THYDBla77Ol0PmV7bDtmiUvtS/b8u73LOSCo kNvK4iQD+G5Pd3iTJWleJzwCBtuI X-Google-Smtp-Source: APXvYqwq7A781gkZJAkqmsCfO+McLSq7PZUOW+bRFhafGW/6tdaLRh+XU3oZDXucgrwRiVbXIAVSdw== X-Received: by 2002:a1c:a7c6:: with SMTP id q189mr16330811wme.146.1562579969346; Mon, 08 Jul 2019 02:59:29 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id i66sm3165127wmi.11.2019.07.08.02.59.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:28 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:58:48 +0200 Message-Id: <20190708095913.3460-7-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190708095913.3460-1-m.othacehe@gmail.com> References: <20190708095913.3460-1-m.othacehe@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 9577c4d2c6..e35e8be72f 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)))