diff options
| author | Greg Hogan <code@greghogan.com> | 2021-10-18 17:36:24 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-16 16:59:51 +0100 |
| commit | cff8a12a0a23f09fe1bc0d55f8d7e35ca6054ba0 (patch) | |
| tree | a8000455850afbe4cf05aceb06eff8b400e44440 | |
| parent | 1a0ed46097dfc41e74354c44bd410a97e41df785 (diff) | |
gnu: aws-c-compression: Update to 0.2.14.
* gnu/packages/c.scm (aws-c-compression): Update to 0.2.14.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-c-compression-cmake-prefix.patch:
Delete file.
* gnu/local.mk: Remove it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/c.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/patches/aws-c-compression-cmake-prefix.patch | 13 |
3 files changed, 6 insertions, 18 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 654d7d6c40..b8361728fa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -872,7 +872,6 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-auth-cmake-prefix.patch \ %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\ - %D%/packages/patches/aws-c-compression-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \ %D%/packages/patches/aws-c-s3-cmake-prefix.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 2b80303170..753b145497 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -750,7 +750,8 @@ specifications.") (define-public aws-c-compression (package (name "aws-c-compression") - (version "0.2.13") + ; Update only when updating aws-crt-cpp. + (version "0.2.14") (source (origin (method git-fetch) (uri (git-reference @@ -759,12 +760,13 @@ specifications.") (file-name (git-file-name name version)) (sha256 (base32 - "0zqfxi0fdgapfsfgvsindv63pq7vyl1s376qkpv4jgflyb1v6gp5")) - (patches (search-patches "aws-c-compression-cmake-prefix.patch")))) + "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common"))))) (propagated-inputs `(("aws-c-common" ,aws-c-common))) (synopsis "Amazon Web Services compression library") diff --git a/gnu/packages/patches/aws-c-compression-cmake-prefix.patch b/gnu/packages/patches/aws-c-compression-cmake-prefix.patch deleted file mode 100644 index eefae19c4a..0000000000 --- a/gnu/packages/patches/aws-c-compression-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,10 @@ if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags - endif() - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() |