[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/16: gnu: aws-c-event-stream: Replace patch.
From: |
guix-commits |
Subject: |
13/16: gnu: aws-c-event-stream: Replace patch. |
Date: |
Tue, 16 Nov 2021 11:00:33 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 963ebbc62c1b2eee49f5b00ecd5fb8e11dbbdced
Author: Greg Hogan <code@greghogan.com>
AuthorDate: Mon Oct 18 18:35:11 2021 +0000
gnu: aws-c-event-stream: Replace patch.
* gnu/packages/c.scm (aws-c-event-stream): Replace patch.
[arguments]: Fix CMAKE_PREFIX_PATH.
[source]: Remove patch.
* gnu/packages/patches/aws-c-event-stream-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-event-stream-cmake-prefix.patch | 13 -------------
3 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 8f57eba..5f035aa 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-c-event-stream-cmake-prefix.patch \
%D%/packages/patches/aws-checksums-cmake-prefix.patch \
%D%/packages/patches/azr3.patch \
%D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index 3b10579..34c87c2 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -605,6 +605,7 @@ with fallback to efficient C99 software implementations.")
(define-public aws-c-event-stream
(package
(name "aws-c-event-stream")
+ ; Update only when updating aws-crt-cpp.
(version "0.2.7")
(source (origin
(method git-fetch)
@@ -614,12 +615,13 @@ with fallback to efficient C99 software implementations.")
(file-name (git-file-name name version))
(sha256
(base32
- "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh"))
- (patches (search-patches
"aws-c-event-stream-cmake-prefix.patch"))))
+ "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh"))))
(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)
("aws-c-io" ,aws-c-io)
diff --git a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch
b/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch
deleted file mode 100644
index 79655a9..0000000
--- a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,6 +3,10 @@
- cmake_minimum_required (VERSION 3.1)
- project (aws-c-event-stream C)
-
-+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()
- 06/16: gnu: aws-c-http: Update to 0.6.7., (continued)
- 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, 2021/11/16
- 13/16: gnu: aws-c-event-stream: Replace patch.,
guix-commits <=
- 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