me/guix
Archived
1
0
Fork 0
Code Activity

gnu: zstd: Update to 1.4.5.

Browse source 
* gnu/packages/compression.scm (zstd): Update to 1.4.5.
[arguments]: Add new work-arounds for new Makefile problems.
This commit is contained in:
Tobias Geerinckx-Rice 2020-06-30 19:43:00 +02:00
parent 93a86ed72f
commit 386457b7bd
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/compression.scm
View file

@ -1360,14 +1360,14 @@ or junctions, and always follows hard links.")
(define-public zstd (define-public zstd
(package (package
(name "zstd") (name "zstd")
(version "1.4.4") (version "1.4.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/facebook/zstd/releases/download/" (uri (string-append "https://github.com/facebook/zstd/releases/download/"
"v" version "/zstd-" version ".tar.gz")) "v" version "/zstd-" version ".tar.gz"))
(sha256 (sha256
(base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr")))) (base32 "17nf0r20360i80689bg5ipxbk2413b2dn3z7wj8byqpiddy1rscq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" ;1.2MiB executables and documentation (outputs '("out" ;1.2MiB executables and documentation
"lib" ;1.2MiB shared library and headers "lib" ;1.2MiB shared library and headers
@ -1375,6 +1375,13 @@ or junctions, and always follows hard links.")
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'remove-bogus-check
(lambda _
;; lib/Makefile falsely claims that no .pc file can be created.
(substitute* "lib/Makefile"
(("error configured .*dir ")
"true "))
#t))
(delete 'configure) ;no configure script (delete 'configure) ;no configure script
(add-after 'install 'adjust-library-locations (add-after 'install 'adjust-library-locations
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -1402,6 +1409,9 @@ or junctions, and always follows hard links.")
(string-append "prefix=" (assoc-ref %outputs "out")) (string-append "prefix=" (assoc-ref %outputs "out"))
(string-append "libdir=" (assoc-ref %outputs "lib") "/lib") (string-append "libdir=" (assoc-ref %outputs "lib") "/lib")
(string-append "includedir=" (assoc-ref %outputs "lib") "/include") (string-append "includedir=" (assoc-ref %outputs "lib") "/include")
;; Auto-detection is over-engineered and buggy.
"PCLIBDIR=lib"
"PCINCDIR=include"
;; Skip auto-detection of, and creating a dependency on, the build ;; Skip auto-detection of, and creating a dependency on, the build
;; environment's ‘xz’ for what amounts to a dubious feature anyway. ;; environment's ‘xz’ for what amounts to a dubious feature anyway.
"HAVE_LZMA=0" "HAVE_LZMA=0"