From patchwork Mon Sep 2 15:32:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15225 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 DD7D11734D; Mon, 2 Sep 2019 16:34:55 +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 028B417329 for ; Mon, 2 Sep 2019 16:34:55 +0100 (BST) Received: from localhost ([::1]:37564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oM2-0001ky-E3 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:34:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42095) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLM-0001ON-QJ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLK-0002mh-VN for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLK-0002lt-KZ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLK-0006T1-Ck for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 12/48] gnu: mkfontdir: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:34:10 +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.156743844524755 (code B ref 36477); Mon, 02 Sep 2019 15:34:10 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:05 +0000 Received: from localhost ([127.0.0.1]:58717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLE-0006R1-G6 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:33343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLA-0006PM-Ox for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:02 -0400 Received: by mail-wr1-f67.google.com with SMTP id u16so14480038wrr.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:00 -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=nXYw+zN9bYBenszDgLFfhduj1r7/E4Vvk+eezGBCloI=; b=fsW1xnjinJ5/beDFqLwk0jPxa/j6WdDCjma9pnM9LBhPbwBm/UAhILcAjhOTdnbX0Q 83dY026QXRbZSQ/iEaI+pxZ/XHCd+1kvFfvDxQDpaFPUi9EKjvy6YiFLk+zLOlMvBfeo bKLlFoQNgIo6dTxzBEAu2+wD39iUA8SP0jz8Ka0s8YfPqsJqPzmDDzhbZGvf8/CHkKRL 7mXLi7K8DSsWrDK16DwEzi7q70t3NJTpvk9HeCakgVsRzxHUIyElap1Qkj7FrTE1fyOI iIWC8yCXiPiUdyS3sm3Z0rR73RNPHMKrVEQDkQ4FnHdaZBKxTsSnzJMV+vI7Krqrz7E1 Va6w== 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=nXYw+zN9bYBenszDgLFfhduj1r7/E4Vvk+eezGBCloI=; b=Th1Hhccas0ovSJMWmr7m7i/2vj27Y3gM/Sly+vPrnpm+Ciyoj+/J6NGHjWjHJDF1zM rbdkpZPMaoTbUkFWFWlhzRqVQk3B/x8nCeR4bpZ/GDpa6kc5dCx4SFCZ2qHyE9snQDJz SJzwEi72Y7rxWyJUn94yB/xAwxEcvJ5yaNpDG6tvA535nXuk7LQopfvwItVy3QwEseCj sBPdT6G/k0SvxHvh/Z3C5jtOZ11N2exr24qLUU76qYQdmg0ePy6d4wJ1oCHJ2/teKiGu y9rmg0EK6ZYLeT/jIJiUR2lfxIaf/TNwMLxFtMl7TFGcnVYCaIlKH4+7y3w3bF4z3whl 5sKQ== X-Gm-Message-State: APjAAAVlJ9JBLYuKn6gVkoZRSKcukrNwzOGDvZgcvMka2iEFsM90HwTi BES0pwed2s6MBs857uO3Wt4fJn3v X-Google-Smtp-Source: APXvYqwVwIoyToYY4C8QFYmCJWoe546RZ8q+78BB1csvF/4z08so/iYPveR8uN4/tcnbbOfwVrpeig== X-Received: by 2002:a5d:5642:: with SMTP id j2mr12633755wrw.345.1567438434971; Mon, 02 Sep 2019 08:33:54 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:54 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:57 +0200 Message-Id: <20190902153333.11190-13-m.othacehe@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902153333.11190-1-m.othacehe@gmail.com> References: <20190902153333.11190-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 d7cd585664..d5d983a8d2 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