From patchwork Mon Sep 2 15:32:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15224 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 CAD221734D; Mon, 2 Sep 2019 16:34:48 +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 8E9A717329 for ; Mon, 2 Sep 2019 16:34:48 +0100 (BST) Received: from localhost ([::1]:37562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLw-0001hr-2p for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:34:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42056) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLK-0001OK-V0 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLJ-0002gw-1i for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49910) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLI-0002gn-UX for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLI-0006SW-Oh for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 09/48] gnu: indent: 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:08 +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.156743844424729 (code B ref 36477); Mon, 02 Sep 2019 15:34:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:04 +0000 Received: from localhost ([127.0.0.1]:58711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLD-0006Qf-9h for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:03 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:55015) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL7-0006Og-IG for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:01 -0400 Received: by mail-wm1-f51.google.com with SMTP id k2so13606233wmj.4 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:57 -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=J4EVlF9NjWGdbp6RUKSnrF114qb0famxMcdmDQ4iU10=; b=iCiKAyELlxozG5QbUbb6nWD76oWlcCEnzcNpSw3EvXcnpbpMruoizYzU1657SYi5GR 5yz1m6xBq/pH87I0SuxeydGAMoVKhknbChJqJBJJrodvAGP5GC87ncKq3afzuVRVSaml OuMZ3CDa20BPFydLpV4NYcviKfdDGhZgTYGg0VhlKRCh2MIQD3CVTpvZkoaHXcLiovtx Cgf3I/F03VbEPgrsZkHgqL6dV2jCY9HvA+OWeoFXCY5kedoHpSNIsIxawSItXghPWMTd /XWGXKemqtXRz+vpuRB24xe2Yn7Y1mAUfPPQrqToSmT2DSictSUvQ2WaappauFhq0InE tvJA== 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=J4EVlF9NjWGdbp6RUKSnrF114qb0famxMcdmDQ4iU10=; b=fJ0ShB+j6RVpq/Ml4Zj7B82A6gt9UbU6LGGA3evlYf8ooc7x9WCKWX9LIeTQyW+ybr bkNvt9o7OS1LY2izR/ay03IF77jBqpWycad+c8zZt7si+wFhL1+PngDWFXe97z2pF6UI uqKouzKFkusMeJbPJueukFg5bi5RM+wNFEF9I+R2+00zOB+MmI/BiHFlTnCqar6Fzxlf d0cdry76HNSNbsrWqysZzUtuXKRhL0eGEMDmz9zg8gtqvNh1l7GAdHVYMp6zFAko+GSP UEwDcrDqrKRf5mkoPIkXUQZofkmzLv8YqeZGpiYbk7hqcZWWQowJc5vJ6qAhz4sMqPZ0 JwQA== X-Gm-Message-State: APjAAAWv6pnttPNbaipwkw9foTi+PpVzL2lUz5BOUSCIIWLYYU9DlEsg FbZhNznwzH0v/KOBuhvBjQbwI3nJ X-Google-Smtp-Source: APXvYqwxRadX6kQBeLzMMYehVUcTWXkvKEEygy2GZg9Ji3BTo7syzYXDwkjERS4J0uB1t3lp5mlOXg== X-Received: by 2002:a1c:4383:: with SMTP id q125mr37634036wma.16.1567438431736; Mon, 02 Sep 2019 08:33:51 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:51 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:54 +0200 Message-Id: <20190902153333.11190-10-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/code.scm (indent)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. (indent-2.2.12)[native-inputs]: Inherit from indent native-inputs to keep automake that is added above. --- gnu/packages/code.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 13e2c4ad44..50d6870bc7 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -29,6 +29,7 @@ (define-module (gnu packages code) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -644,9 +645,24 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.") ;; overrides this to be in PREFIX/doc. Fix this. (substitute* "doc/Makefile.in" (("^docdir = .*$") "docdir = @docdir@\n")) + #t)) + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "config" + (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))))) (native-inputs - `(("texinfo" ,texinfo))) + `(("texinfo" ,texinfo) + ("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'. (synopsis "Code reformatter") (description "Indent is a program that makes source code easier to read by