From patchwork Mon Sep 2 15:32:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15235 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 045051734D; Mon, 2 Sep 2019 16:36:20 +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 B5D9817329 for ; Mon, 2 Sep 2019 16:36:19 +0100 (BST) Received: from localhost ([::1]:37614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNO-0003FX-UU for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42007) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLI-0001N0-PX for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLH-0002d6-Hr for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLH-0002d1-Ej for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLH-0006Ry-Ay for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 05/48] gnu: libpaper: 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:07 +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.156743843524645 (code B ref 36477); Mon, 02 Sep 2019 15:34:07 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:33:55 +0000 Received: from localhost ([127.0.0.1]:58697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL5-0006PG-7o for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:55 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:55624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL3-0006Ny-Bq for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:53 -0400 Received: by mail-wm1-f46.google.com with SMTP id g207so11067381wmg.5 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33: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=uEJlu+nj8wYQv4Io36GWgKbWiTaW16j8T1ZQciMpFfY=; b=jD5LiqqgN8c2O0XixAlCQqsG8N7mgWvB6Sv0Ux/2mqI8cCT6sAj5rpzEwE4tjkz46d heUO4n58mRa+HauNUP6KPFEjFMJR26nWXylh5YEtJB3nlMC6KA6p8sh26nSSyjMUDkN8 0cM38ivalf9eff5s5ZcS2CIzgT762SSgiKQa2fnqW6Nryi+DJGKzniEbwx46BcrZAR3m z+Eb2QBbaLWOtA5NB6bbGnbjqyQ5KDkvc+Y3lh2uuQWtkCtVuw+iw1M3VEks5cz1AiX4 tQI1mfsTGv4SyIfTX7VNQ+sgDjSIPNSeIsM3ye4S7mlBxoNGHyJ0a9+PkyxgB6hauPz0 yKpg== 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=uEJlu+nj8wYQv4Io36GWgKbWiTaW16j8T1ZQciMpFfY=; b=Dw25F8jM0nIwCJxtFARYSTFouq5TsSdMoPEAAb4oWUv2yvgKQbvBEg+wxWkoZSsXT9 +DIwXQ215cygStKFRGGLqqK6j1zxYB8fzYbaiTOr+JcVl0EnZsoJEvas9Exn4XfYCAWC BKiHYtM+HTl7UFDtKgkqlcuuI0uigdKw06km5L4Xhd6I8JhtqrYYhLuWvX1VpNy7EAE5 aX1q1mPRNYRNX29/zma+1WsGBGHWgthqNUfygIAJLks6AH0kEpFlnlgwQ6DV/E3Y15qX oGzaYHVCIAe25NFA+6MK5f1myG99U9xhY22SoZWMINNN3/x3BAev8XwtPI47MY4q6chV lVfw== X-Gm-Message-State: APjAAAUeXxDAw14b/9q8zcwMr/J0l/XjJD0vHwml2ryHlD5gzEFKZvKz Of6kgE012t6qs6pTxL9SXywx6RYi X-Google-Smtp-Source: APXvYqyYD5izd6yfN4kqKEKg0I6DwgF/FFXccIvzK5vwiTBo6P9p18jslSmy60MMe7IMKbUMEFTinQ== X-Received: by 2002:a7b:c0d4:: with SMTP id s20mr8634626wmh.110.1567438427528; Mon, 02 Sep 2019 08:33:47 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:47 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:50 +0200 Message-Id: <20190902153333.11190-6-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/ghostscript.scm (libpaper)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/ghostscript.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 817104cde1..e6879eada9 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -84,6 +85,24 @@ Consortium standard (ICC), approved as ISO 15076-1.") (sha256 (base32 "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q")))) (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'. + (arguments + `(#: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))))) (synopsis "Library for handling paper sizes") (description "The paper library and accompanying files are intended to provide a simple