From patchwork Mon Jul 8 09:59:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14520 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 5A54B171D4; Mon, 8 Jul 2019 11:02:26 +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 1BCB0171D2 for ; Mon, 8 Jul 2019 11:02:26 +0100 (BST) Received: from localhost ([::1]:40032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQTZ-0006F7-Oc for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:02:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54974) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRX-0005Q2-F8 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRV-0003Bt-O6 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49058) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRV-0003Bg-Et for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRV-0004vF-B4 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 19/31] gnu: indent: 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:17 +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.156257999718655 (code B ref 36477); Mon, 08 Jul 2019 10:00:17 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:57 +0000 Received: from localhost ([127.0.0.1]:57838 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRA-0004qd-Vs for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:57 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:37244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR0-0004nI-Hv for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:47 -0400 Received: by mail-wm1-f53.google.com with SMTP id f17so15706402wme.2 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:46 -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=QOfp9AvAiEE2w0Nhd6tVv65i7N+CuYmSscs9xW0UtC0=; b=gBWM8AbRM+27G7TOxIu2hn1vJht0x1wK+f3b18F81YD8Es+AldHK7Pk6CCVsMcgb3+ YfdflUhYSBJOhujS7VP/nq8C1312NYVataRJinUoP58AFd48eMkAzHVZpwl/XSDDFnm+ evQiM6BBjabItXlG6BOQQ8m17pqPhvrHiXcHzYdFFsMtpM1xv/mmQzy3I0FT33/0B4pF YcrAc7pL8v9e3i/wtZAdOojfui74o/3gas+jMyk/7pvH49b6rlyjOQW8IIee1FY1FLjC pvVF5B2ZIAhP5utFKBf8TpGTxvf1uHPbrYtWlwo3z///H3vWMQPXIUHeBC0wnCro9+ta An1g== 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=QOfp9AvAiEE2w0Nhd6tVv65i7N+CuYmSscs9xW0UtC0=; b=A88CmxqQgSrAr3ir8YaSUdB4zDfmVxuSSfiVXO310jbe2ojmGXqQ5DPc8F2JbkIs8/ MxQO46ET1jc004tRnWlHmvHuPC3umBbvRB4PwBwTxU7fY/Ptp1xlkGfSQewbVHhSq6LA 8k7d7CttMcCloqkH7/tGeAiVmx802/LAA3E34yP34Q8bHNsyIwecBpLOBbNKeHkZjAfi z6mVU6NZnYyTau3FbnSeGY7ja6Gc8QsVUdRCY8aoLt/C56viV4MxtK244dGHSppoprPM YgrUoC8lwhmhJCObNZ74rEmDXe69vBxtfjJxJzFFNIFkbfzcH3OzjOfa7fqXUj+W5RFH 5vmg== X-Gm-Message-State: APjAAAUJEhE5dkhYLAOJmjMhz8xBopuEXz4XfFK7koH4vvywudrX9tly FzJ/oe5HbXjfZvNC0tuYVSaJe7tE X-Google-Smtp-Source: APXvYqxpyqNJTTZRQzk7XZIPG11j0jrlAZZKt2yqr6STmQbRSIGelCh7onKmVGjGKaOZxj0bQBHB5A== X-Received: by 2002:a05:600c:2503:: with SMTP id d3mr16579737wma.41.1562579980426; Mon, 08 Jul 2019 02:59:40 -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.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:39 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:59:01 +0200 Message-Id: <20190708095913.3460-20-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/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 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index c5dfa4aa7a..22111f7b09 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:) @@ -634,6 +635,8 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.") (sha256 (base32 "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa")))) (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'. (arguments `(#:phases (modify-phases %standard-phases @@ -644,6 +647,20 @@ 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))))) (synopsis "Code reformatter") (description @@ -666,7 +683,9 @@ extensions over the standard utility.") (sha256 (base32 "12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7")))) - (native-inputs `(("texinfo" ,texinfo))))) + (native-inputs + `(("texinfo" ,texinfo) + ,@(package-native-inputs indent))))) (define-public amalgamate (let* ((commit "c91f07eea1133aa184f652b8f1398eaf03586208")