From patchwork Mon Jul 8 09:59:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14535 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 2AC31171D4; Mon, 8 Jul 2019 11:05:08 +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 D9741171D2 for ; Mon, 8 Jul 2019 11:05:07 +0100 (BST) Received: from localhost ([::1]:40076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQWB-0007bU-Co for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:05:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55141) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRe-0005if-VO for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRd-0003Kr-7J for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:26 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49073) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRc-0003KZ-W2 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRc-0004wo-TC for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:24 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 28/31] gnu: mkfontdir: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Jul 2019 10:00:24 +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.156258001518889 (code B ref 36477); Mon, 08 Jul 2019 10:00:24 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 10:00:15 +0000 Received: from localhost ([127.0.0.1]:57872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRS-0004uT-QP for submit@debbugs.gnu.org; Mon, 08 Jul 2019 06:00:15 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR7-0004on-Uw for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:54 -0400 Received: by mail-wr1-f68.google.com with SMTP id a10so15231961wrp.9 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:53 -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=xAEOrjBcXIUfi9YWA8NIv3uRcEOffHpNVarB+ktFxN8=; b=kBp/D4hqP6xxplUCdm2yeAvkuvfSIR5lmrxyorsPHOe/d2qNE1LhUJCZ3zR9JoQrUU vOxmoGRl5PrUokbskFrwbwKtTw+9BJarFOc8NJvfyGqFxTLUGKWfVFWJao9AQ2I6dXlE ASiNF9PXGcU5hw4BaU3iDosMzH+iKY07rGB039Bme4DZ49siEjLnPuIzloJRRFkSOwf4 LFziU1TZMRp48kRqiuXhVeThSSsnr0jXlliQ3Upc+46XNE5pgIHND5JYhnG3K5h5Tyzs AYurRPdcLucl45oNmsrl99IlPEWMSx/o0R+plVcZjjtP0y9DbIMaiWAm/87GtfLDVcVs Q3YQ== 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=xAEOrjBcXIUfi9YWA8NIv3uRcEOffHpNVarB+ktFxN8=; b=mazQmwC8VB0rS9aF0uWHKyXU7tM33l1nx0YBPAQTyVE2DfSEYUh6dIrsGBuXeoPJ7h pbQCShAl6o4ve+42QJJvch+Vk0WYMqQKuO+DhROcLYYQeRv1bdK0lZfIPKs3kg01p0bE fInLtBGKOdr3j+Aiabqq1hv8MVQl/62YyRiykm2JDhVPcMNY7P8R1ypxF1o1U4BmBiLm ygR87ytDtYjn6ynrEUzHYO0lfrTl0HVMaeWKulqJ+0VpbWfUi8s3ZLbbbA4fxtV6UaWd GxaAct9eZ2bm/kwDAuaks6VzcTePp1Me3LmmJL1GPorizGlV92aFCzhGQQM4/VncHO++ zmyQ== X-Gm-Message-State: APjAAAXyoms+G05EbubzAXXqRH7H1Z7wTvIkgK1ncnyvcCge1klGkzdm 37hXVpiIklG+wtKMWNKzLNErrV1E X-Google-Smtp-Source: APXvYqwqCdyMrJ5AMCqjDoegKuy7Z+q/BqYi51xQbfWnl3ZcaBwlKGmzlX1aDodRzneIUKYzqQuenA== X-Received: by 2002:a5d:514f:: with SMTP id u15mr9188879wrt.183.1562579988076; Mon, 08 Jul 2019 02:59:48 -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.47 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:47 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:59:10 +0200 Message-Id: <20190708095913.3460-29-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> 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 e35e8be72f..ef742d6a37 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. ;;; @@ -4736,8 +4737,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") @@ -4749,7 +4763,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