From patchwork Mon Sep 2 15:32:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15226 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 984721734D; Mon, 2 Sep 2019 16:35:02 +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 4DA8C17329 for ; Mon, 2 Sep 2019 16:35:02 +0100 (BST) Received: from localhost ([::1]:37566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oM9-0001wJ-QG for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:35:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42097) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLM-0001OP-Ps 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-0002kp-8s for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49913) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLJ-0002j0-Mx for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLJ-0006Se-G6 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 10/48] gnu: libsamplerate: 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:09 +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.156743844424745 (code B ref 36477); Mon, 02 Sep 2019 15:34:09 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:04 +0000 Received: from localhost ([127.0.0.1]:58714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLD-0006Qo-Pu for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:39603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL8-0006Ot-IP for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:01 -0400 Received: by mail-wm1-f41.google.com with SMTP id n2so13669529wmk.4 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:58 -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=mY2FkG0vR4e3pmvL4B5XN1RoOZdmfFqkodnWOUzt9Aw=; b=NUwPfWd2sT0do4ZRpiH/Lf1GUC9eWqAp4VU+YupwCJ5IyqwI3IROvq9dXMaSUXGe5v LCKDaONRpGj0XbpNcgqyG4IPuXJ0ZZmotxwmq3xjxVXcvU5kvtNyhWVze4b0xBYg1IBs nf3D2n+S9qGxEfhH3opbPteZ8M2TKN/6PULBWFYsXM120ngGkQyU+AsYy4rPQn92yQr/ ckWCsVdwAeIU8StDEF0iP5jgj2vBDsQO0L53lWRI83XWndGsmSAwK6J+MH2bZHVm9uz1 vznpVmIQlq+6UC4qHwEgTGFtVM3aPtoHILKey/9xJvaygRFTOOmOefaTnVtxGoTYBN+O YlOQ== 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=mY2FkG0vR4e3pmvL4B5XN1RoOZdmfFqkodnWOUzt9Aw=; b=oiYmTCKKuDhUDVb1vZ3HnojgSXZ0HDBk1PfM8KMe/hOqavV9tEpPD5z1Q6WYrI/txM SSnz7tT2RTgIq7UqXxqCEs9fww6ff/O8VjtqKgQfc0XHw+KqJBvmMDh8RDMOve6B82yI SZOC59u1e3W46qKOfHk+jPVWNNIlPG+uM2jQz3InDjhyDF5WHspU0LlYmq56hEovzxYn EPH5VReCRoHEnOP3Rcnw/5j4gOzmPyVNT/prEfEyioE/X2IeQxuKFYD7mWoX/keGMgG2 R27u+nYgn+38siKLItvxIB90iMBPhaUr7SJoXeD6gAc8Rm4mutmx65t9CCEWlJ4JHxFN Jn0w== X-Gm-Message-State: APjAAAVpKOr+jbz82/zEkuWzGJhHw6Oi25bTLvEy8cAqb355PLP1FXDw x764RcZEB3JVE8CeKrg1yu9coEwK X-Google-Smtp-Source: APXvYqzXY7FEsxKR8+mVfsksG85RO6ObMsFEiiqxJdGu5GxPZHfxabIXZXmjjVEicC+d6B7CttnzSg== X-Received: by 2002:a1c:f604:: with SMTP id w4mr36899776wmc.169.1567438432710; Mon, 02 Sep 2019 08:33:52 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:52 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:55 +0200 Message-Id: <20190902153333.11190-11-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/pulseaudio.scm (libsamplerate)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/pulseaudio.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index ff4049d707..89773d8be2 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -102,10 +104,28 @@ for reading and writing new sound file formats.") "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("automake" ,automake))) ;For up to date 'config.guess' and 'config.sub'. (propagated-inputs `(("libsndfile" ,libsndfile) ("fftw" ,fftw))) + (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: + (with-directory-excursion "Cfg" + (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))))) (home-page "http://www.mega-nerd.com/SRC/index.html") (synopsis "Audio sample rate conversion library") (description