efraim pushed a commit to branch wip-riscv
in repository guix.
commit 6e4fe86bf8bd57e823abea5ddcf6a00015994687
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Oct 7 10:48:06 2021 +0300
gnu: libx264: Fix building on riscv64-linux.
* gnu/packages/video.scm (libx264)[inputs]: Add config.
[arguments]: Adjust configure-flags to always build PIC code. Add custom
phase to replace config.guess, config.sub scripts.
---
gnu/packages/video.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 2830aaa..9d986f3 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -915,6 +915,8 @@ shared library and encoder and decoder command-line
executables.")
(native-inputs
`(("pkg-config" ,pkg-config)
("nasm" ,nasm)))
+ (inputs
+ `(("config" ,config)))
;; TODO: Add gpac input
(arguments
`(#:tests? #f ;no check target
@@ -925,6 +927,7 @@ shared library and encoder and decoder command-line
executables.")
;; program depends on ffmpeg and ffmpeg depends on
;; libx264).
"--disable-cli"
+ "--enable-pic"
;; On MIPS, we must pass "--disable-asm" or else
;; configure fails after printing: "You specified
a
@@ -935,7 +938,17 @@ shared library and encoder and decoder command-line
executables.")
(or (%current-target-system)
(%current-system)))
'("--disable-asm")
- '()))))
+ '()))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'update-config-scripts
+ (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")))))))
(home-page "https://www.videolan.org/developers/x264.html";)
(synopsis "H.264 video coding library")
(description "libx264 is an advanced encoding library for creating
