From 2429d076931d945b378b6bf0f6ca1c87a5d6282d Mon Sep 17 00:00:00 2001 From: ganchuantao1 Date: Thu, 5 Jun 2025 16:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=20=20=20=20=E9=80=82=E9=85=8Dprotobuf5.29=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20=20=20=20=20Signed-off-by:ganchuantao1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao1 --- fix-mingw-complier-error.patch | 12 ++++++++++++ install.sh | 1 + install_no_lock.sh | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 fix-mingw-complier-error.patch diff --git a/fix-mingw-complier-error.patch b/fix-mingw-complier-error.patch new file mode 100644 index 0000000..4c6fadf --- /dev/null +++ b/fix-mingw-complier-error.patch @@ -0,0 +1,12 @@ +diff -uprN a/absl/debugging/symbolize.cc b/absl/debugging/symbolize.cc +--- a/absl/debugging/symbolize.cc 2025-02-03 23:50:45.000000000 +0800 ++++ b/absl/debugging/symbolize.cc 2025-06-05 15:55:46.561863000 +0800 +@@ -20,7 +20,7 @@ + #include + #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) + // UWP doesn't have access to win32 APIs. +-#define ABSL_INTERNAL_HAVE_SYMBOLIZE_WIN32 ++// #define ABSL_INTERNAL_HAVE_SYMBOLIZE_WIN32 + #endif + #endif + \ No newline at end of file diff --git a/install.sh b/install.sh index 22cc967..48e62b9 100755 --- a/install.sh +++ b/install.sh @@ -16,6 +16,7 @@ fi tar zxvf $2/abseil-cpp-20250127.0.tar.gz mv abseil-cpp-20250127.0 abseil-cpp cd abseil-cpp +patch -p1 < $2/fix-mingw-complier-error.patch flock -u 100 } 100<>lock_file.lock exit 0 \ No newline at end of file diff --git a/install_no_lock.sh b/install_no_lock.sh index c646955..f75761f 100755 --- a/install_no_lock.sh +++ b/install_no_lock.sh @@ -14,5 +14,5 @@ fi tar zxvf abseil-cpp-20250127.0.tar.gz mv abseil-cpp-20250127.0 abseil-cpp cd $1/abseil-cpp - +patch -p1 < $1/fix-mingw-complier-error.patch exit 0 -- Gitee