From patchwork Mon Jul 8 09:58: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: 14517 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 3A7C8171D5; Mon, 8 Jul 2019 11:02:06 +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 ED449171D3 for ; Mon, 8 Jul 2019 11:02:05 +0100 (BST) Received: from localhost ([::1]:40018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQTF-00061u-I8 for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:02:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55014) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRY-0005Sh-P2 for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRT-00039j-Jx for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRT-00039V-Ed for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRT-0004ui-CI for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 15/31] gnu: libpaper: 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:15 +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.156257999118582 (code B ref 36477); Mon, 08 Jul 2019 10:00:15 +0000 Received: (at 36477) by debbugs.gnu.org; 8 Jul 2019 09:59:51 +0000 Received: from localhost ([127.0.0.1]:57824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR4-0004pS-Df for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:50 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:38204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQQx-0004mJ-4Q for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:43 -0400 Received: by mail-wm1-f45.google.com with SMTP id s15so15722096wmj.3 for <36477@debbugs.gnu.org>; Mon, 08 Jul 2019 02:59:42 -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=KGFaXrkf342enjs0UmD4VjtVc1/tlgyMeICziS0N2dc=; b=i8cbESkEKy2G+byVjoKHCZXsevzZPsop4DhscCrrta3WaI7eGjFuiEROHcfMNHZR1J NrY8E32HOgy1AgJE/pF1nng40HHoeNc7ZrwYVDuVIGYOO/bbBhRsdWvS2dm2/pNDmBtb aBfEbaNftCD4b60ysKKNy/6XG0pK35Df2kjnEbWAdP0NNv1QxFQ8YPi+ykcOhB9HbLaD qi7S4eiizyYjZXpQmULgERCCGXR5FkoRzcw28KCSphGsad1A25a+QSh1AfIgSdwL5EEt hLKjkxs585/OPW0CTMKLqTB+cqIpANoOsn6m6D50rcrUrIqELwWn3VGUnVEdTKYmEAxg JNQg== 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=KGFaXrkf342enjs0UmD4VjtVc1/tlgyMeICziS0N2dc=; b=jzclwlq+0B7WfQpeFWfLFSjy01r6wddqXCWnk2BDj2/kbvzgkgVDqXC8e+lhZV4rTo H+da2zSxHBhZd8RVQOL/sjFACkrDZbwEQuzAyo0IrdKYX+wY7+KxGyFlwvMh4YzFxwAq eNcRs151/0G45dqIINrjFpcMYdsU4Y/vb4lbUeUrmS6I6BQROPPxz0p3R6svqB6sFXAw RH4X1MM06O2zxuh5dYnTZ0WlIeVgV1jlId3Osb4LyHcnFnIujgQa9Be8PXzzVFjwr5br jSS+j1ccnd0B4x2SaoRq4l4UxfASxWDJDeu0UyIpomsnlPzgUa7t0hTXC0jXOVwI5DjP HwaA== X-Gm-Message-State: APjAAAV2Hn4Su6U2SSdS0WiWErTHp7lQ5OPLiQP3RBQlG8o170S5z+CX jo/hIT5UeAm0bsmIJHpsBZM+4eQY X-Google-Smtp-Source: APXvYqz/bXuEKFKJNNau6LSUt+e6DYey3sJoF7gcRN7r0zj2qX/TxWndyWztsUVZXdH3HaRp8LBQ/Q== X-Received: by 2002:a1c:1bd7:: with SMTP id b206mr11335565wmb.85.1562579977250; Mon, 08 Jul 2019 02:59:37 -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.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:36 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:58:57 +0200 Message-Id: <20190708095913.3460-16-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/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 53a9b60fdb..ad035170a2 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. ;;; @@ -91,6 +92,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