From patchwork Wed Aug 21 08:54:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15081 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 D03C017264; Wed, 21 Aug 2019 09:59:29 +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,URIBL_BLOCKED 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 9383F1724B for ; Wed, 21 Aug 2019 09:59:29 +0100 (BST) Received: from localhost ([::1]:45668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSm-0002NR-IS for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58535) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPW-0006UG-7U for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPU-0005DF-TT for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPU-0005D7-Q9 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPU-0006Xe-Nl for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 06/61] gnu: xorg: Fix cross-compilation of multiple packages. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:04 +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.156637771824630 (code B ref 36477); Wed, 21 Aug 2019 08:56:04 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:18 +0000 Received: from localhost ([127.0.0.1]:34560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOj-0006P1-IR for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:18 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOd-0006Mx-NJ for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:12 -0400 Received: by mail-wr1-f66.google.com with SMTP id z1so1205943wru.13 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:11 -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=CzmXvH9sLbiBiry88aGjqDYH5AcO7nsanJIa88F0VwU=; b=u6wW58jJFbc9hfYlO+aakRdXyQLURQxMV+2dTmRBTdNQHlCefm24/orIXUUCnuWaZ8 8m2bCg1yr29m83tx3tq/urhV9A3u7GJ8v1VRQfF3kuEduJ6vHhHpRKS0AbjT2i2ou4BU bQ6lflaC5hbwkja/SigMAUsT22VU2LpRefl7NBmTPRgGTaobEr9/2O9QN0LsWZWaF4it YgK8itR/+1lTp7X7v433xu0j+z84lmz3zb8zHw8KuDnDITyw+JW8aeWoRIIth88wn2B1 aRjoqSeA7dw2PwM7kYr/ISVfLrqVAq5qrbP3bL3UwH8z0vfpHi2kINN261OkbWmaThYX pRbQ== 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=CzmXvH9sLbiBiry88aGjqDYH5AcO7nsanJIa88F0VwU=; b=LxozTvfCNeroSEXXLx/in3oSbqI6AbqRAhsYVGdWeZFVp+sTTZAa/idTBFEbxgH4IW pggW8SnyhfLjRSN8KGltkPdAXHfFF8D0j9W8r0F5d9jmj2saCTCNLD8GB1DeNd4xFtnt ++rnQSbMQ3+GLIM+oQ4OuhVVw5B5faaB2WSlTW4rykZmH3rfCqr438wqZwNAyadYAj31 TI2PMJ0I2iXRAGxrViKRQSBD/fHI8aGFGeXHFVp2S7IujFPLTbN8tLnPlWkXcjSJTdsT KU33gOJpq5b3Q95jvjQVD28gnctpk7e9KlRe5YG7RJBRCCjELNd2I2CcJLfWjzlJRJMC SEOA== X-Gm-Message-State: APjAAAUc+OtJy8xNlFifqkqlfr0DTxezkl6tDvC/UdcpTqU5Uf0Vdr3+ sI3GCMTBSCz5VAhS6JlZZmYP+YsAVlM= X-Google-Smtp-Source: APXvYqzNSA1B+OnzNb9TMYoumXKHeliqbGxVvPpjuNIfpBs1VJV1jiymNeh/pcsVhQGXTk14oYpLqQ== X-Received: by 2002:a5d:4cc5:: with SMTP id c5mr11750490wrt.278.1566377704826; Wed, 21 Aug 2019 01:55:04 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:04 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:00 +0200 Message-Id: <20190821085455.18508-6-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e4848b7bee..aa89dafe90 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.")