[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/31: gnu: libsamplerate: Fix aarch64 cross-compilation.
From: |
guix-commits |
Subject: |
20/31: gnu: libsamplerate: Fix aarch64 cross-compilation. |
Date: |
Mon, 8 Jul 2019 05:43:41 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 0511a931eb2ddc552dd1be9b513036fdee222099
Author: Mathieu Othacehe <address@hidden>
Date: Thu Jul 4 09:01:44 2019 +0200
gnu: libsamplerate: Fix aarch64 cross-compilation.
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 96d15bd..7c91ec2 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2017 Stefan Reichör <address@hidden>
;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Pierre Langlois <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; 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
- branch wip-cross-system created (now c09e15a), guix-commits, 2019/07/08
- 13/31: gnu: libgit2: Fix cross compilation., guix-commits, 2019/07/08
- 05/31: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/07/08
- 11/31: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/07/08
- 18/31: gnu: bc: Fix cross-compilation., guix-commits, 2019/07/08
- 15/31: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/07/08
- 20/31: gnu: libsamplerate: Fix aarch64 cross-compilation.,
guix-commits <=
- 10/31: gnu: openssl: Fix cross-compilation., guix-commits, 2019/07/08
- 09/31: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/07/08
- 21/31: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/07/08
- 08/31: gnu: python: Fix cross-compilation., guix-commits, 2019/07/08
- 24/31: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/07/08
- 31/31: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/07/08
- 25/31: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/07/08
- 28/31: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/07/08
- 03/31: gnu: tcl: Fix cross-compilation., guix-commits, 2019/07/08
- 17/31: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/07/08