ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 05:39:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: aws-c-io: Update to 0.10.9.

Browse source 
* gnu/packages/c.scm (aws-c-io): Update to 0.10.9.
[arguments]: Fix CMAKE_PREFIX_PATH, disable network tests.
[source]: Remove patches.
* gnu/packages/patches/aws-c-io-cmake-prefix.patch,
gnu/packages/patches/aws-c-io-disable-networking-tests.patch:
Delete files.
* gnu/local.mk: Remove them.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Greg Hogan 2021-10-18 17:32:57 +00:00 committed by Ludovic Courtès
parent 5715a07af3
commit 2a32dedfbf
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
4 changed files with 7 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/local.mk
View file

@ -878,8 +878,6 @@ dist_patch_DATA = \
%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-io-cmake-prefix.patch \
%D%/packages/patches/aws-c-io-disable-networking-tests.patch \
%D%/packages/patches/aws-c-s3-cmake-prefix.patch \
%D%/packages/patches/aws-c-s3-disable-networking-tests.patch \
%D%/packages/patches/aws-checksums-cmake-prefix.patch \

14
gnu/packages/c.scm
View file

@ -638,7 +638,8 @@ (define-public aws-c-event-stream
(define-public aws-c-io
(package
(name "aws-c-io")
(version "0.10.5")
; Update only when updating aws-crt-cpp.
(version "0.10.9")
(source (origin
(method git-fetch)
(uri (git-reference
@ -647,15 +648,14 @@ (define-public aws-c-io
(file-name (git-file-name name version))
(sha256
(base32
"1jrnzs803jqprnvbw6rqr834qld5sd7flaqzgssp3099m189szpq"))
(patches
(search-patches
"aws-c-io-cmake-prefix.patch"
"aws-c-io-disable-networking-tests.patch"))))
"14rxa3k842fgk43702nz7z9y3clfhvax8j0k93i0c5vg14wj38yp"))))
(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-cal" ,aws-c-cal)
("aws-c-common" ,aws-c-common)

13
gnu/packages/patches/aws-c-io-cmake-prefix.patch
View file

@ -1,13 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,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()

103
gnu/packages/patches/aws-c-io-disable-networking-tests.patch
View file

@ -1,103 +0,0 @@
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -52,8 +52,8 @@ add_test_case(local_socket_communication)
add_net_test_case(tcp_socket_communication)
add_net_test_case(udp_socket_communication)
add_test_case(udp_bind_connect_communication)
-add_net_test_case(connect_timeout)
-add_net_test_case(connect_timeout_cancelation)
+#add_net_test_case(connect_timeout)
+#add_net_test_case(connect_timeout_cancelation)
if (USE_VSOCK)
add_test_case(vsock_loopback_socket_communication)
endif ()
@@ -64,7 +64,7 @@ add_test_case(incoming_tcp_sock_errors)
add_test_case(incoming_duplicate_tcp_bind_errors)
add_test_case(incoming_udp_sock_errors)
add_test_case(wrong_thread_read_write_fails)
-add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode)
+#add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode)
add_test_case(cleanup_in_accept_doesnt_explode)
add_test_case(cleanup_in_write_cb_doesnt_explode)
add_test_case(sock_write_cb_is_async)
@@ -81,21 +81,21 @@ add_test_case(channel_tasks_run)
add_test_case(channel_rejects_post_shutdown_tasks)
add_test_case(channel_cancels_pending_tasks)
add_test_case(channel_duplicate_shutdown)
-add_net_test_case(channel_connect_some_hosts_timeout)
+#add_net_test_case(channel_connect_some_hosts_timeout)
-add_net_test_case(test_default_with_ipv6_lookup)
+#add_net_test_case(test_default_with_ipv6_lookup)
add_test_case(test_resolver_ipv6_address_lookup)
-add_net_test_case(test_default_with_multiple_lookups)
+#add_net_test_case(test_default_with_multiple_lookups)
add_test_case(test_resolver_ipv4_address_lookup)
-add_net_test_case(test_default_with_ipv4_only_lookup)
+#add_net_test_case(test_default_with_ipv4_only_lookup)
add_test_case(test_resolver_ttls)
add_test_case(test_resolver_connect_failure_recording)
add_test_case(test_resolver_ttl_refreshes_on_resolve)
add_net_test_case(test_resolver_listener_create_destroy)
-add_net_test_case(test_resolver_add_listener_before_host)
-add_net_test_case(test_resolver_add_listener_after_host)
-add_net_test_case(test_resolver_add_multiple_listeners_fn)
+#add_net_test_case(test_resolver_add_listener_before_host)
+#add_net_test_case(test_resolver_add_listener_after_host)
+#add_net_test_case(test_resolver_add_multiple_listeners_fn)
add_net_test_case(test_resolver_listener_host_re_add_fn)
add_net_test_case(test_resolver_listener_multiple_results)
add_net_test_case(test_resolver_listener_address_expired_fn)
@@ -121,11 +121,11 @@ add_test_case(socket_handler_close)
if (NOT BYO_CRYPTO)
add_net_test_case(test_concurrent_cert_import)
add_test_case(tls_channel_echo_and_backpressure_test)
- add_net_test_case(tls_client_channel_negotiation_error_expired)
- add_net_test_case(tls_client_channel_negotiation_error_wrong_host)
- add_net_test_case(tls_client_channel_negotiation_error_wrong_host_with_ca_override)
- add_net_test_case(tls_client_channel_negotiation_error_self_signed)
- add_net_test_case(tls_client_channel_negotiation_error_untrusted_root)
+ #add_net_test_case(tls_client_channel_negotiation_error_expired)
+ #add_net_test_case(tls_client_channel_negotiation_error_wrong_host)
+ #add_net_test_case(tls_client_channel_negotiation_error_wrong_host_with_ca_override)
+ #add_net_test_case(tls_client_channel_negotiation_error_self_signed)
+ #add_net_test_case(tls_client_channel_negotiation_error_untrusted_root)
#track these down in s2n and find out why that aren't failing.
#add_net_test_case(tls_client_channel_negotiation_error_revoked)
#add_net_test_case(tls_client_channel_negotiation_error_pinning)
@@ -133,23 +133,23 @@ if (NOT BYO_CRYPTO)
# once done, add these tests as well
#add_net_test_case(tls_client_channel_negotiation_no_verify_revoked)
#add_net_test_case(tls_client_channel_negotiation_no_verify_pinning)
- add_net_test_case(tls_client_channel_negotiation_no_verify_expired)
- add_net_test_case(tls_client_channel_negotiation_no_verify_wrong_host)
- add_net_test_case(tls_client_channel_negotiation_no_verify_self_signed)
- add_net_test_case(tls_client_channel_negotiation_no_verify_untrusted_root)
-
- add_net_test_case(tls_client_channel_negotiation_error_socket_closed)
- add_net_test_case(tls_client_channel_negotiation_success)
- add_net_test_case(tls_client_channel_negotiation_success_ecc256)
- add_net_test_case(tls_client_channel_negotiation_success_ecc384)
+ #add_net_test_case(tls_client_channel_negotiation_no_verify_expired)
+ #add_net_test_case(tls_client_channel_negotiation_no_verify_wrong_host)
+ #add_net_test_case(tls_client_channel_negotiation_no_verify_self_signed)
+ #add_net_test_case(tls_client_channel_negotiation_no_verify_untrusted_root)
+
+ #add_net_test_case(tls_client_channel_negotiation_error_socket_closed)
+ #add_net_test_case(tls_client_channel_negotiation_success)
+ #add_net_test_case(tls_client_channel_negotiation_success_ecc256)
+ #add_net_test_case(tls_client_channel_negotiation_success_ecc384)
add_net_test_case(tls_server_multiple_connections)
add_net_test_case(tls_server_hangup_during_negotiation)
- add_net_test_case(tls_client_channel_no_verify)
+ #add_net_test_case(tls_client_channel_no_verify)
add_net_test_case(test_tls_negotiation_timeout)
add_net_test_case(tls_double_channel)
add_net_test_case(alpn_successfully_negotiates)
add_net_test_case(alpn_no_protocol_message)
- add_net_test_case(test_ecc_cert_import)
+ #add_net_test_case(test_ecc_cert_import)
add_test_case(alpn_error_creating_handler)
add_test_case(tls_destroy_null_context)
add_test_case(tls_channel_statistics_test)