nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: libvpx: Move hard-coded logic out of configure phase. 

* gnu/packages/video.scm (libvpx)[arguments]: Move arguments from
CONFIGURE-PHASE to #:make-flags and #:configure-flags.
This commit is contained in:
Marius Bakke 2018-01-17 00:38:26 +01:00
parent b658e165f3
commit e896c227e3
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/video.scm
View File

@ -23,6 +23,7 @@
;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net> ;;; Copyright © 2017 Gregor Giesen <giesen@zaehlwerk.net>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Roel Janssen <roel@gnu.org> ;;; Copyright © 2018 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1126,20 +1127,19 @@ access to mpv's powerful playback capabilities.")
(patches (search-patches "libvpx-CVE-2016-2818.patch")))) (patches (search-patches "libvpx-CVE-2016-2818.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:configure-flags (list "--enable-shared"
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(setenv "CONFIG_SHELL" (which "bash"))
(let ((out (assoc-ref outputs "out")))
(setenv "LDFLAGS"
(string-append "-Wl,-rpath=" out "/lib"))
(zero? (system* "./configure"
"--enable-shared"
"--as=yasm" "--as=yasm"
;; Limit size to avoid CVE-2015-1258 ;; Limit size to avoid CVE-2015-1258
"--size-limit=16384x16384" "--size-limit=16384x16384"
(string-append "--prefix=" out))))))) (string-append "--prefix=" (assoc-ref %outputs "out")))
#:make-flags (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib"))
#:phases (modify-phases %standard-phases
(replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys)
;; The configure script does not understand some of the GNU
;; options, so we only add the flags specified above.
(apply invoke "./configure" configure-flags))))
#:tests? #f)) ; no check target #:tests? #f)) ; no check target
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)