summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-06-30 19:43:00 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2020-06-30 19:43:28 +0200
commit386457b7bda963be9f0119a785b71bc64e0c105e (patch)
tree880447a5d40c683f093d7dff233f73565b9b5435
parentgnu: zstd: Follow GNU conventions for make variables. (diff)
downloadguix-core-updates.tar.gz
guix-core-updates.tar.bz2
guix-core-updates.tar.xz
gnu: zstd: Update to 1.4.5.core-updates
* gnu/packages/compression.scm (zstd): Update to 1.4.5. [arguments]: Add new work-arounds for new Makefile problems.
-rw-r--r--gnu/packages/compression.scm14
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 86b6e43..8e7578d 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1360,14 +1360,14 @@ or junctions, and always follows hard links.")
1360(define-public zstd 1360(define-public zstd
1361 (package 1361 (package
1362 (name "zstd") 1362 (name "zstd")
1363 (version "1.4.4") 1363 (version "1.4.5")
1364 (source 1364 (source
1365 (origin 1365 (origin
1366 (method url-fetch) 1366 (method url-fetch)
1367 (uri (string-append "https://github.com/facebook/zstd/releases/download/" 1367 (uri (string-append "https://github.com/facebook/zstd/releases/download/"
1368 "v" version "/zstd-" version ".tar.gz")) 1368 "v" version "/zstd-" version ".tar.gz"))
1369 (sha256 1369 (sha256
1370 (base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr")))) 1370 (base32 "17nf0r20360i80689bg5ipxbk2413b2dn3z7wj8byqpiddy1rscq"))))
1371 (build-system gnu-build-system) 1371 (build-system gnu-build-system)
1372 (outputs '("out" ;1.2MiB executables and documentation 1372 (outputs '("out" ;1.2MiB executables and documentation
1373 "lib" ;1.2MiB shared library and headers 1373 "lib" ;1.2MiB shared library and headers
@@ -1375,6 +1375,13 @@ or junctions, and always follows hard links.")
1375 (arguments 1375 (arguments
1376 `(#:phases 1376 `(#:phases
1377 (modify-phases %standard-phases 1377 (modify-phases %standard-phases
1378 (add-after 'unpack 'remove-bogus-check
1379 (lambda _
1380 ;; lib/Makefile falsely claims that no .pc file can be created.
1381 (substitute* "lib/Makefile"
1382 (("error configured .*dir ")
1383 "true "))
1384 #t))
1378 (delete 'configure) ;no configure script 1385 (delete 'configure) ;no configure script
1379 (add-after 'install 'adjust-library-locations 1386 (add-after 'install 'adjust-library-locations
1380 (lambda* (#:key outputs #:allow-other-keys) 1387 (lambda* (#:key outputs #:allow-other-keys)
@@ -1402,6 +1409,9 @@ or junctions, and always follows hard links.")
1402 (string-append "prefix=" (assoc-ref %outputs "out")) 1409 (string-append "prefix=" (assoc-ref %outputs "out"))
1403 (string-append "libdir=" (assoc-ref %outputs "lib") "/lib") 1410 (string-append "libdir=" (assoc-ref %outputs "lib") "/lib")
1404 (string-append "includedir=" (assoc-ref %outputs "lib") "/include") 1411 (string-append "includedir=" (assoc-ref %outputs "lib") "/include")
1412 ;; Auto-detection is over-engineered and buggy.
1413 "PCLIBDIR=lib"
1414 "PCINCDIR=include"
1405 ;; Skip auto-detection of, and creating a dependency on, the build 1415 ;; Skip auto-detection of, and creating a dependency on, the build
1406 ;; environment's ‘xz’ for what amounts to a dubious feature anyway. 1416 ;; environment's ‘xz’ for what amounts to a dubious feature anyway.
1407 "HAVE_LZMA=0" 1417 "HAVE_LZMA=0"