-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
23 changed files
with
1,208 additions
and
957 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
ext/0001-fix-build-for-mingw-w64-ucrt-x86_64-toolchain.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
From 6bdc93aac66f2282823dceee802b60e2447c4ba9 Mon Sep 17 00:00:00 2001 | ||
From: Sergey Avseyev <[email protected]> | ||
Date: Fri, 20 Oct 2023 20:48:33 -0700 | ||
Subject: [PATCH] fix build for mingw-w64-ucrt-x86_64-toolchain | ||
|
||
--- | ||
src/crypto/CMakeLists.txt | 4 ++++ | ||
src/crypto/curve25519/internal.h | 2 +- | ||
2 files changed, 5 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt | ||
index 68fb65b30..f53a9eee9 100644 | ||
--- a/src/crypto/CMakeLists.txt | ||
+++ b/src/crypto/CMakeLists.txt | ||
@@ -335,6 +335,10 @@ if(WIN32) | ||
target_link_libraries(crypto ws2_32) | ||
endif() | ||
|
||
+if(MINGW) | ||
+ target_link_libraries(crypto --static-libgcc --static-libstdc++) | ||
+endif() | ||
+ | ||
if(NOT ANDROID) | ||
find_package(Threads REQUIRED) | ||
target_link_libraries(crypto Threads::Threads) | ||
diff --git a/src/crypto/curve25519/internal.h b/src/crypto/curve25519/internal.h | ||
index 0cd1a12aa..ab33badc0 100644 | ||
--- a/src/crypto/curve25519/internal.h | ||
+++ b/src/crypto/curve25519/internal.h | ||
@@ -32,7 +32,7 @@ void x25519_NEON(uint8_t out[32], const uint8_t scalar[32], | ||
#endif | ||
|
||
#if !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_SMALL) && \ | ||
- defined(__GNUC__) && defined(__x86_64__) | ||
+ defined(__GNUC__) && defined(__x86_64__) && !defined(__MINGW32__) | ||
#define BORINGSSL_FE25519_ADX | ||
|
||
// fiat_curve25519_adx_mul is defined in | ||
-- | ||
2.42.0.windows.2 |
Submodule couchbase
updated
from f72a08 to 65c8d1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.