diff options
Diffstat (limited to 'gnu/packages/patches')
3 files changed, 19 insertions, 77 deletions
diff --git a/gnu/packages/patches/aws-c-auth-cmake-prefix.patch b/gnu/packages/patches/aws-c-auth-cmake-prefix.patch deleted file mode 100644 index da3e4eb4a5..0000000000 --- a/gnu/packages/patches/aws-c-auth-cmake-prefix.patch +++ /dev/null @@ -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() diff --git a/gnu/packages/patches/aws-c-auth-disable-networking-tests.patch b/gnu/packages/patches/aws-c-auth-disable-networking-tests.patch deleted file mode 100644 index 905247f528..0000000000 --- a/gnu/packages/patches/aws-c-auth-disable-networking-tests.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -19,8 +19,8 @@ add_test_case(profile_credentials_provider_environment_test) - add_test_case(credentials_provider_first_in_chain_test) - add_test_case(credentials_provider_second_in_chain_test) - add_test_case(credentials_provider_null_chain_test) --add_test_case(credentials_provider_default_basic_test) --add_test_case(credentials_provider_default_manual_tls_test) -+#add_test_case(credentials_provider_default_basic_test) -+#add_test_case(credentials_provider_default_manual_tls_test) - add_test_case(credentials_provider_imds_new_destroy) - add_test_case(credentials_provider_imds_connect_failure) - add_test_case(credentials_provider_imds_token_request_failure) -@@ -58,28 +58,28 @@ add_test_case(credentials_provider_x509_basic_success) - add_test_case(credentials_provider_x509_success_multi_part_doc) - add_test_case(credentials_provider_x509_real_new_destroy) - --add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_env) --add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_config) --add_net_test_case(credentials_provider_sts_web_identity_new_failed_without_env_and_config) --add_net_test_case(credentials_provider_sts_web_identity_connect_failure) --add_net_test_case(credentials_provider_sts_web_identity_request_failure) --add_net_test_case(credentials_provider_sts_web_identity_bad_document_failure) --add_net_test_case(credentials_provider_sts_web_identity_test_retry_error1) --add_net_test_case(credentials_provider_sts_web_identity_test_retry_error2) --add_net_test_case(credentials_provider_sts_web_identity_basic_success_env) --add_net_test_case(credentials_provider_sts_web_identity_basic_success_config) --add_net_test_case(credentials_provider_sts_web_identity_success_multi_part_doc) --add_net_test_case(credentials_provider_sts_web_identity_real_new_destroy) -- --add_net_test_case(credentials_provider_sts_direct_config_succeeds) --add_net_test_case(credentials_provider_sts_direct_config_succeeds_after_retry) --add_net_test_case(credentials_provider_sts_direct_config_invalid_doc) --add_net_test_case(credentials_provider_sts_direct_config_connection_failed) --add_net_test_case(credentials_provider_sts_direct_config_service_fails) --add_net_test_case(credentials_provider_sts_from_profile_config_succeeds) --add_net_test_case(credentials_provider_sts_from_profile_config_manual_tls_succeeds) --add_net_test_case(credentials_provider_sts_from_profile_config_environment_succeeds) --add_net_test_case(credentials_provider_sts_cache_expiration_conflict) -+#add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_env) -+#add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_config) -+#add_net_test_case(credentials_provider_sts_web_identity_new_failed_without_env_and_config) -+#add_net_test_case(credentials_provider_sts_web_identity_connect_failure) -+#add_net_test_case(credentials_provider_sts_web_identity_request_failure) -+#add_net_test_case(credentials_provider_sts_web_identity_bad_document_failure) -+#add_net_test_case(credentials_provider_sts_web_identity_test_retry_error1) -+#add_net_test_case(credentials_provider_sts_web_identity_test_retry_error2) -+#add_net_test_case(credentials_provider_sts_web_identity_basic_success_env) -+#add_net_test_case(credentials_provider_sts_web_identity_basic_success_config) -+#add_net_test_case(credentials_provider_sts_web_identity_success_multi_part_doc) -+#add_net_test_case(credentials_provider_sts_web_identity_real_new_destroy) -+ -+#add_net_test_case(credentials_provider_sts_direct_config_succeeds) -+#add_net_test_case(credentials_provider_sts_direct_config_succeeds_after_retry) -+#add_net_test_case(credentials_provider_sts_direct_config_invalid_doc) -+#add_net_test_case(credentials_provider_sts_direct_config_connection_failed) -+#add_net_test_case(credentials_provider_sts_direct_config_service_fails) -+#add_net_test_case(credentials_provider_sts_from_profile_config_succeeds) -+#add_net_test_case(credentials_provider_sts_from_profile_config_manual_tls_succeeds) -+#add_net_test_case(credentials_provider_sts_from_profile_config_environment_succeeds) -+#add_net_test_case(credentials_provider_sts_cache_expiration_conflict) - - add_test_case(credentials_provider_process_new_destroy_from_config) - add_test_case(credentials_provider_process_new_failed) diff --git a/gnu/packages/patches/aws-c-auth-install-private-headers.patch b/gnu/packages/patches/aws-c-auth-install-private-headers.patch new file mode 100644 index 0000000000..990fd6f2eb --- /dev/null +++ b/gnu/packages/patches/aws-c-auth-install-private-headers.patch @@ -0,0 +1,19 @@ +aws-sdk-cpp depends on the private headers from aws-c-auth. This dependency was +added to aws-sdk-cpp in commit 23cca02c2df on 2021-06-04. + +The following error is generated when building aws-sdk-cpp when the private +aws-c-auth headers are not installed: + +/tmp/guix-build-aws-sdk-cpp-1.9.121.drv-0/aws-sdk-cpp-1.9.121-checkout/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp:17:10: fatal error: aws/auth/private/aws_signing.h: No such file or directory + #include <aws/auth/private/aws_signing.h> + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,6 +114,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS} ${PLATFORM_LIBS}) + aws_prepare_shared_lib_exports(${PROJECT_NAME}) + + install(FILES ${AWS_AUTH_ROOT_HEADERS} DESTINATION "include/aws/auth" COMPONENT Development) ++install(FILES ${AWS_AUTH_PRIVATE_HEADERS} DESTINATION "include/aws/auth/private" COMPONENT Development) + + if (BUILD_SHARED_LIBS) + set (TARGET_DIR "shared") |