diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/c.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/patches/aws-c-auth-install-private-headers.patch | 19 |
3 files changed, 2 insertions, 25 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index acc1a2bfa7..6f78876efb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1031,7 +1031,6 @@ dist_patch_DATA = \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/awesome-4.3-fno-common.patch \ - %D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/azr3-remove-lash.patch \ %D%/packages/patches/barony-fix-textures.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 36a51afc19..cb620e4aa6 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -1310,7 +1310,7 @@ currently limited to Huffman encoding and decoding.") (package (name "aws-c-auth") ;; Update only when updating aws-crt-cpp. - (version "0.7.26") + (version "0.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -1319,10 +1319,7 @@ currently limited to Huffman encoding and decoding.") (file-name (git-file-name name version)) (sha256 (base32 - "0im29xh80dpm4hlwq02dyv6il9whbcxhgwp1gw5nj68c33dp4ryk")) - (patches - (search-patches - "aws-c-auth-install-private-headers.patch")))) + "1pfnd65q72rg4y062ajd5imzl6v4n2cgn7nimjxkb0p6shhd8c0z")))) (build-system cmake-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/patches/aws-c-auth-install-private-headers.patch b/gnu/packages/patches/aws-c-auth-install-private-headers.patch deleted file mode 100644 index 990fd6f2eb..0000000000 --- a/gnu/packages/patches/aws-c-auth-install-private-headers.patch +++ /dev/null @@ -1,19 +0,0 @@ -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") |