[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/16: gnu: aws-checksums: Replace patch.
From: |
guix-commits |
Subject: |
14/16: gnu: aws-checksums: Replace patch. |
Date: |
Tue, 16 Nov 2021 11:00:34 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 14f540593bd95bb78ea68373babdc04a862dd561
Author: Greg Hogan <code@greghogan.com>
AuthorDate: Mon Oct 18 18:39:15 2021 +0000
gnu: aws-checksums: Replace patch.
* gnu/packages/c.scm (aws-checksums): Replace patch.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-checksums-cmake-prefix.patch:
Delete file.
* gnu/local.mk: Remove it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/local.mk | 1 -
gnu/packages/c.scm | 8 +++++---
gnu/packages/patches/aws-checksums-cmake-prefix.patch | 13 -------------
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5f035aa..6aada73 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -871,7 +871,6 @@ dist_patch_DATA =
\
%D%/packages/patches/avidemux-install-to-lib.patch \
%D%/packages/patches/awesome-reproducible-png.patch \
%D%/packages/patches/aws-c-auth-install-private-headers.patch \
- %D%/packages/patches/aws-checksums-cmake-prefix.patch \
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
%D%/packages/patches/bash-completion-directories.patch \
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 34c87c2..e37c173 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -578,6 +578,7 @@ portability.")
(define-public aws-checksums
(package
(name "aws-checksums")
+ ; Update only when updating aws-crt-cpp.
(version "0.1.12")
(source (origin
(method git-fetch)
@@ -587,12 +588,13 @@ portability.")
(file-name (git-file-name name version))
(sha256
(base32
- "054f2hkmkxhw83q7zsz349k82xk6bkrvlsab088pf7kn9wd4hy4k"))
- (patches (search-patches "aws-checksums-cmake-prefix.patch"))))
+ "054f2hkmkxhw83q7zsz349k82xk6bkrvlsab088pf7kn9wd4hy4k"))))
(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")))))
(inputs
`(("aws-c-common" ,aws-c-common)))
(synopsis "Amazon Web Services checksum library")
diff --git a/gnu/packages/patches/aws-checksums-cmake-prefix.patch
b/gnu/packages/patches/aws-checksums-cmake-prefix.patch
deleted file mode 100644
index f6a5c9a..0000000
--- a/gnu/packages/patches/aws-checksums-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,6 +8,10 @@
- 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()
- 01/16: gnu: guix: Update to 9bbbac6., (continued)
- 01/16: gnu: guix: Update to 9bbbac6., guix-commits, 2021/11/16
- 06/16: gnu: aws-c-http: Update to 0.6.7., guix-commits, 2021/11/16
- 08/16: gnu: aws-c-auth: Update to 0.6.4., guix-commits, 2021/11/16
- 02/16: gnu: s2n: Update to 1.1.0., guix-commits, 2021/11/16
- 07/16: gnu: aws-c-compression: Update to 0.2.14., guix-commits, 2021/11/16
- 15/16: gnu: aws-sdk-cpp: Enable text-to-speech library., guix-commits, 2021/11/16
- 05/16: gnu: aws-c-cal: Update to 0.5.12., guix-commits, 2021/11/16
- 09/16: gnu: aws-c-s3: Update to 0.1.26., guix-commits, 2021/11/16
- 11/16: gnu: aws-crt-cpp: Update to 0.17.1., guix-commits, 2021/11/16
- 16/16: gnu: Add texlive-xifthen., guix-commits, 2021/11/16
- 14/16: gnu: aws-checksums: Replace patch.,
guix-commits <=
- 13/16: gnu: aws-c-event-stream: Replace patch., guix-commits, 2021/11/16
- 12/16: gnu: aws-sdk-cpp: Update to 1.9.136., guix-commits, 2021/11/16
- 04/16: gnu: aws-c-io: Update to 0.10.9., guix-commits, 2021/11/16