From 9f01229c95d76458945451e7508fe5960784aa7a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 5 Jun 2022 02:00:04 +0200
Subject: gnu: c-blosc: Update to 1.21.1.
* gnu/packages/compression.scm (c-blosc): Update to 1.21.1.
[arguments]: Remove obsolete PREFER_EXTERNAL_SNAPPY from #:configure-flags.
---
gnu/packages/compression.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'gnu/packages/compression.scm')
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 382fe348a0..8428b6d973 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2575,7 +2575,7 @@ (define-public tarsplitter
(define-public c-blosc
(package
(name "c-blosc")
- (version "1.18.1")
+ (version "1.21.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2584,13 +2584,12 @@ (define-public c-blosc
(file-name (git-file-name name version))
(sha256
(base32
- "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70"))))
+ "0gy9a7wp7x71x5l3rprx8wpb3c5cn7wqc77gdiffq35hr34q88p9"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
'("-DDEACTIVATE_AVX2=ON"
"-DPREFER_EXTERNAL_LZ4=ON"
- "-DPREFER_EXTERNAL_SNAPPY=ON"
"-DPREFER_EXTERNAL_ZLIB=ON"
"-DPREFER_EXTERNAL_ZSTD=ON")))
(inputs
--
cgit v1.2.3
From 495c248920eeff84146e0fb6ed73cd47661a28ec Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 5 Jun 2022 02:00:00 +0200
Subject: gnu: c-blosc: Omit static library.
* gnu/packages/compression.scm (c-blosc)[arguments]: Add "-DBUILD_STATIC=OFF" to #:configure-flags.
---
gnu/packages/compression.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'gnu/packages/compression.scm')
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 8428b6d973..9d8106b6d5 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2588,7 +2588,8 @@ (define-public c-blosc
(build-system cmake-build-system)
(arguments
`(#:configure-flags
- '("-DDEACTIVATE_AVX2=ON"
+ '("-DBUILD_STATIC=OFF"
+ "-DDEACTIVATE_AVX2=ON"
"-DPREFER_EXTERNAL_LZ4=ON"
"-DPREFER_EXTERNAL_ZLIB=ON"
"-DPREFER_EXTERNAL_ZSTD=ON")))
--
cgit v1.2.3
From 2d80b869f0158b8b6d830cc9dbbaa78d3681ced1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 5 Jun 2022 02:00:00 +0200
Subject: gnu: c-blosc: Remove bundled libraries from source.
* gnu/packages/compression.scm (c-blosc)[source]: Add snippet.
---
gnu/packages/compression.scm | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
(limited to 'gnu/packages/compression.scm')
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 9d8106b6d5..d4a52ff111 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2576,15 +2576,19 @@ (define-public c-blosc
(package
(name "c-blosc")
(version "1.21.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Blosc/c-blosc")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0gy9a7wp7x71x5l3rprx8wpb3c5cn7wqc77gdiffq35hr34q88p9"))))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Blosc/c-blosc")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0gy9a7wp7x71x5l3rprx8wpb3c5cn7wqc77gdiffq35hr34q88p9"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; In a rare victory, we may delete all bundled libs to no ill effect.
+ '(delete-file-recursively "internal-complibs"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
cgit v1.2.3
From 34c7c922f51b8988e7e1d943e56f7c6b3b2a7563 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 5 Jun 2022 02:00:00 +0200
Subject: gnu: c-blosc: Remove input labels.
* gnu/packages/compression.scm (c-blosc)[inputs]:
Remove input labels.
---
gnu/packages/compression.scm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
(limited to 'gnu/packages/compression.scm')
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index d4a52ff111..3ba8eea5e9 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2598,10 +2598,7 @@ (define-public c-blosc
"-DPREFER_EXTERNAL_ZLIB=ON"
"-DPREFER_EXTERNAL_ZSTD=ON")))
(inputs
- `(("lz4" ,lz4)
- ("snappy" ,snappy)
- ("zlib" ,zlib)
- ("zstd:lib" ,zstd "lib")))
+ (list lz4 snappy zlib `(,zstd "lib")))
(home-page "https://blosc.org")
(synopsis "Blocking, shuffling and lossless compression library")
(description
--
cgit v1.2.3