me
/
guix
Archived
1
0
Fork 0
Code

gnu: libtheora: Fix cross-compiling to riscv64-linux. 

* gnu/packages/xiph.scm (libtheora):
[native-inputs]: When cross compiling to riscv64-linux-gnu, add config.
[arguments]: When target riscv64-linux-gnu, add update-config phase.

Change-Id: Ie055cd4f6cb9d2a4601b93d1f9db227598349c7c
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Zheng Junjie 2024-03-05 01:19:35 +08:00 committed by Ludovic Courtès
parent 5980c8a6b1
commit 64d269b983
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/xiph.scm
View File

@ -46,6 +46,7 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -117,7 +118,26 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to
(patches (search-patches "libtheora-config-guess.patch")))) (patches (search-patches "libtheora-config-guess.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:configure-flags #~'("--disable-static"))) (append
(if (and (target-riscv64?)
(%current-target-system))
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'update-config
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(for-each (lambda (file)
(install-file
(search-input-file
(or native-inputs inputs)
(string-append "/bin/" file)) "."))
'("config.guess" "config.sub"))))))
'())
(list #:configure-flags #~'("--disable-static"))))
(native-inputs
(if (and (target-riscv64?)
(%current-target-system))
(list config)
'()))
(inputs (list libvorbis)) (inputs (list libvorbis))
;; The .pc files refer to libogg. ;; The .pc files refer to libogg.
(propagated-inputs (list libogg)) (propagated-inputs (list libogg))