[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/16: gnu: aws-c-mqtt: Replace patch.
From: |
guix-commits |
Subject: |
10/16: gnu: aws-c-mqtt: Replace patch. |
Date: |
Tue, 16 Nov 2021 11:00:32 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit d5c9f52a37ee782888f6db2e5a7e5f34153a2054
Author: Greg Hogan <code@greghogan.com>
AuthorDate: Mon Oct 18 17:53:16 2021 +0000
gnu: aws-c-mqtt: Replace patch.
* gnu/packages/c.scm (aws-c-mqtt): Replace patch.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-c-mqtt-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-c-mqtt-cmake-prefix.patch | 13 -------------
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index b24fd01..1bbe6bc 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-install-private-headers.patch \
%D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \
- %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \
%D%/packages/patches/aws-checksums-cmake-prefix.patch \
%D%/packages/patches/aws-crt-cpp-cmake-prefix.patch \
%D%/packages/patches/aws-crt-cpp-disable-networking-tests.patch \
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index ecf79bd..3b10579 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -846,6 +846,7 @@ Service (S3) protocol for object storage.")
(define-public aws-c-mqtt
(package
(name "aws-c-mqtt")
+ ; Update only when updating aws-crt-cpp.
(version "0.7.8")
(source (origin
(method git-fetch)
@@ -855,12 +856,13 @@ Service (S3) protocol for object storage.")
(file-name (git-file-name name version))
(sha256
(base32
- "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"))
- (patches (search-patches "aws-c-mqtt-cmake-prefix.patch"))))
+ "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c"))))
(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-http" ,aws-c-http)
("aws-c-io" ,aws-c-io)))
diff --git a/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch
b/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch
deleted file mode 100644
index 987024b..0000000
--- a/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,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()
- branch master updated (0a9a00b -> 7dce1df), guix-commits, 2021/11/16
- 03/16: gnu: aws-c-common: Update to 0.6.11., guix-commits, 2021/11/16
- 10/16: gnu: aws-c-mqtt: Replace patch.,
guix-commits <=
- 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