amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into staging

Browse source
This commit is contained in:
Marius Bakke 2020-11-19 00:04:32 +01:00
commit 35ed83beae
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
84 changed files with 1545 additions and 1155 deletions
Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/compression.scm
View file

@ -849,9 +849,9 @@ time for compression ratio.")
"0zmhvczscqz0mzh4b9m8m42asq14db0a6lc8clp5ljq5ybrv70d9"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; no check target
`(#:tests? #f ; no check target
#:make-flags
(list "CC=gcc"
(list (string-append "CC=" ,(cc-for-target))
"XZ_SUPPORT=1"
"LZO_SUPPORT=1"
"LZ4_SUPPORT=1"
@ -956,7 +956,8 @@ tarballs.")
"0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "INSTALL=install" "CC=gcc"
`(#:make-flags (list "INSTALL=install"
(string-append "CC=" ,(cc-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases (modify-phases %standard-phases
(delete 'configure)
@ -1426,7 +1427,10 @@ or junctions, and always follows hard links.")
#t))))
#:make-flags
(list "CC=gcc"
;; TODO: Integrate in next rebuild cycle.
(list ,(if (%current-target-system)
(string-append "CC=" (cc-for-target))
"CC=gcc")
(string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "LIBDIR=" (assoc-ref %outputs "lib") "/lib")
(string-append "INCLUDEDIR=" (assoc-ref %outputs "lib") "/include")
@ -1458,8 +1462,14 @@ speed.")
(version (package-version zstd))
(source (package-source zstd))
(build-system gnu-build-system)
(inputs
`(,@(if (%current-target-system)
`(("googletest" ,googletest))
'())))
(native-inputs
`(("googletest" ,googletest)))
`(,@(if (%current-system)
`(("googletest" ,googletest))
'())))
(arguments
`(#:phases
(modify-phases %standard-phases
@ -1477,7 +1487,8 @@ speed.")
(install-file "README.md" doc)
#t))))
#:make-flags
(list "CC=gcc"
(list (string-append "CC=" ,(cc-for-target))
(string-append "CXX=" ,(cxx-for-target))
(string-append "PREFIX=" (assoc-ref %outputs "out")))))
(home-page (package-home-page zstd))
(synopsis "Threaded implementation of the Zstandard compression algorithm")