summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorGreg Hogan <code@greghogan.com>2021-10-18 18:39:15 +0000
committerLudovic Courtès <ludo@gnu.org>2021-11-16 16:59:52 +0100
commit14f540593bd95bb78ea68373babdc04a862dd561 (patch)
tree41d4e2ac1fec9c30f4a0c4e3a4c9d3ce0546ce03 /gnu/packages
parent963ebbc62c1b2eee49f5b00ecd5fb8e11dbbdced (diff)
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>
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/c.scm8
-rw-r--r--gnu/packages/patches/aws-checksums-cmake-prefix.patch13
2 files changed, 5 insertions, 16 deletions
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 34c87c2d4b..e37c173fc0 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 f6a5c9ad9c..0000000000
--- 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()