gnu: faust-2: Update to 2.5.23.

* gnu/packages/audio.scm (faust-2): Update to 2.5.23.
[native-inputs]: Replace llvm-with-rtti with llvm-3.8-with-rtti.
* gnu/packages/llvm.scm (llvm-with-rtti): Rename this variable...
(llvm-3.8-with-rtti): ...to this variable; inherit from llvm-3.8.
master
Ricardo Wurmus 2018-11-11 16:18:24 +01:00
parent 37a350ecce
commit 89c7894805
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 19 additions and 22 deletions

View File

@ -1176,19 +1176,15 @@ PS, and DAB+.")
(define-public faust-2
(package
(inherit faust)
(version "2.1.0")
(version "2.5.23")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/grame-cncm/faust.git")
(commit (string-append "v"
(string-map (lambda (c)
(if (char=? c #\.) #\- c))
version)))))
(file-name (string-append "faust-" version "-checkout"))
(method url-fetch)
(uri (string-append "https://github.com/grame-cncm/faust/"
"releases/download/" version
"/faust-" version ".tar.gz"))
(sha256
(base32
"06km0ygwxxwgw1lqldccqidxhmjfz8ck0wnbd95qk5sg8sbpc068"))))
"1yz5jnr76hh7rmxkpdi7gyrw1wp4gyqfpq8zyl97qdi5ga5gjznq"))))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments faust)
@ -1196,7 +1192,7 @@ PS, and DAB+.")
`(list (string-append "prefix=" (assoc-ref %outputs "out"))
"world"))))
(native-inputs
`(("llvm" ,llvm-with-rtti)
`(("llvm" ,llvm-3.8-with-rtti)
("which" ,which)
("xxd" ,xxd)
("ctags" ,emacs-minimal) ; for ctags

View File

@ -90,17 +90,6 @@ languages is in development. The compiler infrastructure includes mirror sets
of programming tools as well as libraries with equivalent functionality.")
(license license:ncsa)))
(define-public llvm-with-rtti
(package (inherit llvm)
(name "llvm-with-rtti")
(arguments
(substitute-keyword-arguments (package-arguments llvm)
((#:configure-flags flags)
`(append '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
"-DLLVM_REQUIRES_RTTI=1")
,flags))))))
(define* (clang-runtime-from-llvm llvm hash
#:optional (patches '()))
(package
@ -290,6 +279,18 @@ code analysis tools.")
(base32
"1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"))))))
;; This is for Faust 2
(define-public llvm-3.8-with-rtti
(package (inherit llvm-3.8)
(name "llvm-with-rtti")
(arguments
(substitute-keyword-arguments (package-arguments llvm)
((#:configure-flags flags)
`(append '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
"-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
"-DLLVM_REQUIRES_RTTI=1")
,flags))))))
(define-public clang-runtime-3.8
(clang-runtime-from-llvm
llvm-3.8