From patchwork Wed Aug 21 08:54:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15088 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 A24AF17264; Wed, 21 Aug 2019 10:00:07 +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 564D41724B for ; Wed, 21 Aug 2019 10:00:07 +0100 (BST) Received: from localhost ([::1]:45698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTO-00031V-52 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58825) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPk-0006wA-Ow for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPj-0005ON-Hh for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54103) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPj-0005OB-9S for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPj-0006bH-7W for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 28/61] gnu: mkfontdir: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:19 +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.156637776625184 (code B ref 36477); Wed, 21 Aug 2019 08:56:19 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:06 +0000 Received: from localhost ([127.0.0.1]:34660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPV-0006Y3-Ug for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOw-0006QH-II for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:30 -0400 Received: by mail-wm1-f68.google.com with SMTP id k1so1278257wmi.1 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:30 -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 :mime-version:content-transfer-encoding; bh=0ptBZb3n2bYaP2VzVC64s792fkyNqp7zY774lcQ3mXU=; b=blXaseuVCxkI7Mz9LaZH+6gz4IvvDQoAw7WZrQGyqzCYXkJDZLXquV0i+mWtaq75QB hry9YCVa1FCSeo8Z46KfMU0Mz8twfw9ntton/aG9TYC+7BICuWn3ywiKtmxJ6Orkkb1v lJNvdrRvYKRGAFk3pFtKU+Yk1jvv+pNB1/zkU2Z019lmi8rcbSD+wfppNZR5hXsZZSBs Lkn2XbIDR/jlAPASEO11UkTYm0/trGzAveL5tpbN8MFvUcYrxiE9xYxHcYzSlhLN1dTD baG6Ma0wwdpeVoHqq7weLS0XSfLN9i4YGBegEoNVKyq0ZK8pKXggR2J33AAGorU1QZbO 1bBA== 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:mime-version:content-transfer-encoding; bh=0ptBZb3n2bYaP2VzVC64s792fkyNqp7zY774lcQ3mXU=; b=kZnuT7EhZdR4matwpcHgKouZCoE9FFySpQAc/+YHLmLI7DwHY1nYBhE3Il3zvKn/l6 13Mj3BPtWZSKrjayfMgqm9tedxy9h5BU8lTpyWfImqDVj1FFMplo1Pkos4TTDrUne8Cz PEPlqG3MTBfsn46hA5VSxgifBGQcPSMW9IFzlm6pnsC9Hw2bbTt2xb+0Hlv9QId03G0J 6BKMePvXFYFcIbMXPJwv2cnmB2mCIMpVkFD0iAzEUBu2UXAi9oZmxin4fY8huS4uzsCj D5lOAj7+zv+t5E2jiYpcmqmhuuTatloj1/Pj7K8kPz5c/5KyFnHlldV9p5lNgy7v08Ks x8jQ== X-Gm-Message-State: APjAAAXnxNGMmiuw4ag6kkIQhhyBu4dHVSRWukEjhOSVbygvRJHTzdKU r3/oHO7tFIz/RbNgLO0+n6gd4IwhTmQ= X-Google-Smtp-Source: APXvYqyyfODyqYSCJX78daqyrcYEwazRYb/Za338+md9OwD9w4+PncyOAPVmGRDZsvjx18USU/SCIg== X-Received: by 2002:a1c:45:: with SMTP id 66mr4712810wma.40.1566377724707; Wed, 21 Aug 2019 01:55:24 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:23 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:22 +0200 Message-Id: <20190821085455.18508-28-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> MIME-Version: 1.0 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 The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/xorg.scm (mkfontdir)[arguments]: Replace outdated config.sub and config.guess, by the ones taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/xorg.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index aa89dafe90..d4ea12be95 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -4742,8 +4743,21 @@ protocol and arbitrary X extension protocol.") "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (for-each (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess")) + #t)) (add-after 'install 'wrap-mkfontdir (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") @@ -4755,7 +4769,8 @@ protocol and arbitrary X extension protocol.") (inputs `(("mkfontscale" ,mkfontscale))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("automake" ,automake))) ;For up to date 'config.guess' and 'config.sub'. (home-page "https://www.x.org/wiki/") (synopsis "Create an index of X font files in a directory") (description