[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
38/38: gnu: libx264: Fix building on riscv64-linux.
From: |
guix-commits |
Subject: |
38/38: gnu: libx264: Fix building on riscv64-linux. |
Date: |
Sun, 10 Oct 2021 09:28:07 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv
in repository guix.
commit bcff8f967512a2962aad5450a48f8297233fa2f2
Author: Efraim Flashner <efraim@flashner.co.il>
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 452974d..ffc3ac7 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -870,6 +870,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
@@ -880,6 +882,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
@@ -890,7 +893,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
- 29/38: gnu: dtc: Build without valgrind on riscv64-linux., (continued)
- 29/38: gnu: dtc: Build without valgrind on riscv64-linux., guix-commits, 2021/10/10
- 34/38: build-system/meson: Fix cross-building to riscv64-linux., guix-commits, 2021/10/10
- 35/38: gnu: gtk+: Remove some more failing tests., guix-commits, 2021/10/10
- 19/38: gnu: Use libunwind-next for riscv64-linux., guix-commits, 2021/10/10
- 23/38: gnu: mozjs-60: Add support for riscv64-linux., guix-commits, 2021/10/10
- 25/38: gnu: nss: Adjust make-flags for riscv64-linux., guix-commits, 2021/10/10
- 30/38: gnu: php: Skip tests failing on riscv64-linux., guix-commits, 2021/10/10
- 31/38: gnu: make-opensbi-package: Fix native building., guix-commits, 2021/10/10
- 33/38: gnu: isc-dhcp: Fix building on riscv64-linux., guix-commits, 2021/10/10
- 37/38: system: Add riscv64 support., guix-commits, 2021/10/10
- 38/38: gnu: libx264: Fix building on riscv64-linux.,
guix-commits <=
- 36/38: gnu: Add u-boot-sifive-unmatched-bootloader., guix-commits, 2021/10/10