diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2018-06-19 21:37:41 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2018-06-19 21:49:12 +0300 |
| commit | 2b94c14c9e7bbd2f582e6b5df89424dd089fc78f (patch) | |
| tree | d8b469bef35ed44a24d7308357ed7e3a30e0b429 /gnu/packages/video.scm | |
| parent | 793a66e5fef3f562080000280c022af517aad612 (diff) | |
| download | guix-2b94c14c9e7bbd2f582e6b5df89424dd089fc78f.tar guix-2b94c14c9e7bbd2f582e6b5df89424dd089fc78f.tar.gz | |
gnu: x265: Fix building on armhf-linux and aarch64-linux.
* gnu/packages/video.scm (x265)[source]: Add patch.
[arguments]: Enable PIC on armhf-linux.
* gnu/packages/patches/x265-fix-ppc64le-build.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e31238243f..ff05557089 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -44,6 +44,7 @@ (define-module (gnu packages video) #:use-module (ice-9 match) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) @@ -393,6 +394,7 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (sha256 (base32 "0qx8mavwdzdpkkby7n29i9av7zsnklavacwfz537mf62q2pzjnbf")) + (patches (search-patches "x265-fix-ppc64le-build.patch")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "source/compat/getopt") @@ -401,7 +403,9 @@ and creating Matroska files from other media files (@code{mkvmerge}).") (arguments `(#:tests? #f ; tests are skipped if cpu-optimized code isn't built ;; Currently the source code doesn't check for aarch64. - ,@(if (string-prefix? "aarch64" (or (%current-target-system) (%current-system))) + ,@(if (any (cute string-prefix? <> (or (%current-system) + (%current-target-system))) + '("armhf" "aarch64")) '(#:configure-flags '("-DENABLE_PIC=TRUE")) '()) #:phases |