[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/16: gnu: aws-c-http: Update to 0.6.7.
From: |
guix-commits |
Subject: |
06/16: gnu: aws-c-http: Update to 0.6.7. |
Date: |
Tue, 16 Nov 2021 11:00:30 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 1a0ed46097dfc41e74354c44bd410a97e41df785
Author: Greg Hogan <code@greghogan.com>
AuthorDate: Mon Oct 18 17:33:07 2021 +0000
gnu: aws-c-http: Update to 0.6.7.
* gnu/packages/c.scm (aws-c-http): Update to 0.6.7.
[arguments]: Fix CMAKE_PREFIX_PATH, disable network tests.
[source]: Remove patches.
* gnu/packages/patches/aws-c-http-cmake-prefix.patch,
gnu/packages/patches/aws-c-http-disable-networking-tests.patch:
Delete files.
* gnu/local.mk: Remove them.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
gnu/local.mk | 2 -
gnu/packages/c.scm | 14 +++----
gnu/packages/patches/aws-c-http-cmake-prefix.patch | 13 ------
.../aws-c-http-disable-networking-tests.patch | 48 ----------------------
4 files changed, 7 insertions(+), 70 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a1cc397..654d7d6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -874,8 +874,6 @@ dist_patch_DATA =
\
%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-http-cmake-prefix.patch \
- %D%/packages/patches/aws-c-http-disable-networking-tests.patch\
%D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \
%D%/packages/patches/aws-c-s3-cmake-prefix.patch \
%D%/packages/patches/aws-c-s3-disable-networking-tests.patch \
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index a537988..2b80303 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -719,7 +719,8 @@ low level functionality for coroutines.")
(define-public aws-c-http
(package
(name "aws-c-http")
- (version "0.6.4")
+ ; Update only when updating aws-crt-cpp.
+ (version "0.6.7")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -728,15 +729,14 @@ low level functionality for coroutines.")
(file-name (git-file-name name version))
(sha256
(base32
- "18xlgz68zizkcp784bs6hkyx0gvp0f1p076i46z653bcd3qa87b4"))
- (patches
- (search-patches
- "aws-c-http-cmake-prefix.patch"
- "aws-c-http-disable-networking-tests.patch"))))
+ "1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4"))))
(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"))
+ "-DENABLE_NET_TESTS=OFF")))
(propagated-inputs
`(("aws-c-compression" ,aws-c-compression)
("aws-c-io" ,aws-c-io)))
diff --git a/gnu/packages/patches/aws-c-http-cmake-prefix.patch
b/gnu/packages/patches/aws-c-http-cmake-prefix.patch
deleted file mode 100644
index ec650a7..0000000
--- a/gnu/packages/patches/aws-c-http-cmake-prefix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,10 @@ endif()
-
- option(ENABLE_PROXY_INTEGRATION_TESTS "Whether to run the proxy integration
tests that rely on a proxy server installed and running locally" OFF)
-
-+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()
diff --git a/gnu/packages/patches/aws-c-http-disable-networking-tests.patch
b/gnu/packages/patches/aws-c-http-disable-networking-tests.patch
deleted file mode 100644
index 9bfd422..0000000
--- a/gnu/packages/patches/aws-c-http-disable-networking-tests.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -136,8 +136,8 @@ add_test_case(strutil_trim_http_whitespace)
- add_test_case(strutil_is_http_token)
- add_test_case(strutil_is_lowercase_http_token)
-
--add_net_test_case(tls_download_medium_file_h1)
--add_net_test_case(tls_download_medium_file_h2)
-+#add_net_test_case(tls_download_medium_file_h1)
-+#add_net_test_case(tls_download_medium_file_h2)
-
- add_test_case(websocket_decoder_sanity_check)
- add_test_case(websocket_decoder_simplest_frame)
-@@ -438,21 +438,21 @@ add_test_case(connection_setup_shutdown)
-
- # connection manager tests
- # unit tests where connections are mocked
--add_net_test_case(test_connection_manager_setup_shutdown)
--add_net_test_case(test_connection_manager_acquire_release_mix_synchronous)
--add_net_test_case(test_connection_manager_connect_callback_failure)
--add_net_test_case(test_connection_manager_connect_immediate_failure)
--add_net_test_case(test_connection_manager_proxy_setup_shutdown)
--add_net_test_case(test_connection_manager_idle_culling_single)
--add_net_test_case(test_connection_manager_idle_culling_many)
--add_net_test_case(test_connection_manager_idle_culling_mixture)
-+#add_net_test_case(test_connection_manager_setup_shutdown)
-+#add_net_test_case(test_connection_manager_acquire_release_mix_synchronous)
-+#add_net_test_case(test_connection_manager_connect_callback_failure)
-+#add_net_test_case(test_connection_manager_connect_immediate_failure)
-+#add_net_test_case(test_connection_manager_proxy_setup_shutdown)
-+#add_net_test_case(test_connection_manager_idle_culling_single)
-+#add_net_test_case(test_connection_manager_idle_culling_many)
-+#add_net_test_case(test_connection_manager_idle_culling_mixture)
-
- # tests where we establish real connections
--add_net_test_case(test_connection_manager_single_connection)
--add_net_test_case(test_connection_manager_many_connections)
--add_net_test_case(test_connection_manager_acquire_release)
--add_net_test_case(test_connection_manager_close_and_release)
--add_net_test_case(test_connection_manager_acquire_release_mix)
-+#add_net_test_case(test_connection_manager_single_connection)
-+#add_net_test_case(test_connection_manager_many_connections)
-+#add_net_test_case(test_connection_manager_acquire_release)
-+#add_net_test_case(test_connection_manager_close_and_release)
-+#add_net_test_case(test_connection_manager_acquire_release_mix)
-
-
- add_test_case(h1_server_sanity_check)
- 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, 2021/11/16
- 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 <=
- 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, 2021/11/16