From patchwork Mon Jul 8 09:59:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 14525 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 3A81E171D4; Mon, 8 Jul 2019 11:02:57 +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 DFD23171D2 for ; Mon, 8 Jul 2019 11:02:56 +0100 (BST) Received: from localhost ([::1]:40050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQU4-0006cY-2k for patchwork@mira.cbaines.net; Mon, 08 Jul 2019 06:02:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54983) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkQRX-0005QE-Jn for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkQRW-0003CK-7K for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkQRW-0003C8-0Z for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkQRV-0004vN-TN for guix-patches@gnu.org; Mon, 08 Jul 2019 06:00:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH 20/31] gnu: libsamplerate: 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.156257999718662 (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]:57840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQRB-0004qq-Cc for submit@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:57 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:39189) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkQR1-0004nV-4Q for 36477@debbugs.gnu.org; Mon, 08 Jul 2019 05:59:48 -0400 Received: by mail-wm1-f47.google.com with SMTP id z23so15714818wma.4 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=XP5U71aynJuHrZje95YXgWbwPwfBuT2oajm6I7Hh+bw=; b=sl/LKQNHkWZSKBn7Tng1ma7tiVn2fTrpZSHbEZbbgoHZ0umLn0/oZAlVWYwWtUYtAn L0XhlFi2lOkQnHQAKE28uCHuPA3UvFWGlxNlkfhm567TOPL2gW5HQosVFijqIbvh9cPF D094pCMQY0l/of9jWzUg8ROYZnD2w/YIbTdGnisZFYBooQjvs7O6lTMbox8TCEjCl5uO 7jvcO+J3ScyXLGjUlnWZ1kzpzaE19XT9flf2LyouBRSTasyZMuFowfOEr0jHWHgL33bM dn2DHbNQ0sUV3U9uWd5VcNLYFQtNN5QTgnW4Ueb7JuCtx02EIaCP2XJS6cbIDI8BPU/K IALQ== 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=XP5U71aynJuHrZje95YXgWbwPwfBuT2oajm6I7Hh+bw=; b=f1xR4Drz09a2bSxExh8y+Q/CL477otmSnCMdpEhmsjgnsRJtKM3Yd4dei7JrOOfD7a MyR4mWrlyFMcBLIkCQ1FLYWbziQZEUDqBL+yZoMjye5oTH974ixQljleqrANYg59Xt9m GNuJOIYneJQyPBo0CZXDr0KgC3iHu5nmwxsE8/3y2GxyCoUfj3BRaVsNxXmCVoKpu+fD jCj5PdMWNE/LXLaZneG8u5KL4xsZ6PgrHSNkrR7DcqD/LdMZsXvYndmTLwhGsCSkO6zu Vd9RUjy4tq/MjnNOAPqRYj2ppOiFOzcUWYFEuqkTmC8UFPxILUagHuyJzV314lt/LXaO 224g== X-Gm-Message-State: APjAAAXSUegJNtfO8DRQCMQXNZR4FPV4xidXPBT08QDwq1LGXYf8y5BA zC7m3glW8YAmKR/QRlqK2LlajMJN X-Google-Smtp-Source: APXvYqwdSODzGYN1RnXhXd02BPDsXf+DGb/oP3w3o5Elg5BONvg2/Ny/OKd2WdBI4iTIHZ9Z0U/gEw== X-Received: by 2002:a1c:e710:: with SMTP id e16mr15921836wmh.38.1562579981234; Mon, 08 Jul 2019 02:59:41 -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.40 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 02:59:40 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 8 Jul 2019 11:59:02 +0200 Message-Id: <20190708095913.3460-21-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/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 96d15bdf9c..7c91ec201a 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Langlois +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ (define-module (gnu packages pulseaudio) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -96,10 +98,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