From c905ac67337efc660c102060b972609df37a713a Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Thu, 9 Jun 2022 11:09:27 +0800 Subject: [PATCH 1/6] [glog] fix not work on c++03 --- ports/glog/fix-windows-CXX11_ATOMIC.patch | 17 ------- ports/glog/noerror-nominmax.patch | 60 +++++++++++++++++++++++ ports/glog/portfile.cmake | 2 +- ports/glog/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glog.json | 5 ++ 6 files changed, 68 insertions(+), 20 deletions(-) delete mode 100644 ports/glog/fix-windows-CXX11_ATOMIC.patch create mode 100644 ports/glog/noerror-nominmax.patch diff --git a/ports/glog/fix-windows-CXX11_ATOMIC.patch b/ports/glog/fix-windows-CXX11_ATOMIC.patch deleted file mode 100644 index 1e1723e363e70a..00000000000000 --- a/ports/glog/fix-windows-CXX11_ATOMIC.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 3ecacfb..2d48a0e 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -100,6 +100,12 @@ - #include - #endif - -+#ifdef GLOG_OS_WINDOWS -+#ifndef HAVE_CXX11_ATOMIC -+#define HAVE_CXX11_ATOMIC -+#endif -+#endif -+ - #ifdef HAVE_CXX11_ATOMIC - #include - #elif defined(GLOG_OS_WINDOWS) diff --git a/ports/glog/noerror-nominmax.patch b/ports/glog/noerror-nominmax.patch new file mode 100644 index 00000000000000..f1d2a518b15aaa --- /dev/null +++ b/ports/glog/noerror-nominmax.patch @@ -0,0 +1,60 @@ +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +index 3ecacfb..0bdbe6d 100644 +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -103,7 +103,19 @@ + #ifdef HAVE_CXX11_ATOMIC + #include + #elif defined(GLOG_OS_WINDOWS) ++# ifndef WIN32_LEAN_AND_MEAN ++# define WIN32_LEAN_AND_MEAN // We only need minimal includes ++# endif ++// To avoid macro definition of ERROR. ++// To avoid macro definition of min/max. ++# ifndef NOMINMAX ++# define NOMINMAX ++# endif ++ + #include ++#ifdef ERROR ++# undef ERROR ++#endif + #endif + + @ac_google_start_namespace@ +@@ -1061,7 +1073,7 @@ namespace google { + #elif defined(GLOG_OS_WINDOWS) + + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ + InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ +@@ -1071,7 +1083,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (condition && \ + (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) || true) && \ +@@ -1082,7 +1094,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0, LOG_OCCURRENCES_MOD_N = 0; \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ + InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ +@@ -1092,7 +1104,7 @@ namespace google { + &what_to_do).stream() + + #define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ +- static int LOG_OCCURRENCES = 0; \ ++ static volatile unsigned LOG_OCCURRENCES = 0; \ + if (LOG_OCCURRENCES <= n) \ + InterlockedIncrement(&LOG_OCCURRENCES); \ + if (LOG_OCCURRENCES <= n) \ diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 10e1d13c234441..7edbb2ed7b7dd0 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( glog_disable_debug_postfix.patch fix_glog_CMAKE_MODULE_PATH.patch fix_log_every_n.patch - fix-windows-CXX11_ATOMIC.patch + noerror-nominmax.patch fix_crosscompile_symbolize.patch ) diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json index 5f6b947fed76ac..d53b0421e0417e 100644 --- a/ports/glog/vcpkg.json +++ b/ports/glog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glog", "version": "0.5.0", - "port-version": 4, + "port-version": 5, "description": "C++ implementation of the Google logging module", "homepage": "https://github.com/google/glog", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index ba25c0e43e45e0..949b0936a0a69e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2574,7 +2574,7 @@ }, "glog": { "baseline": "0.5.0", - "port-version": 4 + "port-version": 5 }, "gloo": { "baseline": "20201203", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 94c50d82ac0083..0e0d23076946ef 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb84d3c0e6057e00ef151afde936fa6b4fba33c9", + "version": "0.5.0", + "port-version": 5 + }, { "git-tree": "bb5f54eba990cc0f03c64e1d09f343dd6cd7b22b", "version": "0.5.0", From 17a80f259dd2718a375d06c0686f69c647cf2d57 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 10 Jun 2022 11:16:48 +0800 Subject: [PATCH 2/6] remove NOMINMAX --- ports/glog/noerror-nominmax.patch | 19 +++++++------------ versions/g-/glog.json | 2 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ports/glog/noerror-nominmax.patch b/ports/glog/noerror-nominmax.patch index f1d2a518b15aaa..78f928b9234d0d 100644 --- a/ports/glog/noerror-nominmax.patch +++ b/ports/glog/noerror-nominmax.patch @@ -1,28 +1,23 @@ diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 3ecacfb..0bdbe6d 100644 +index 3ecacfb..ebbc7d5 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in -@@ -103,7 +103,19 @@ +@@ -103,7 +103,14 @@ #ifdef HAVE_CXX11_ATOMIC #include #elif defined(GLOG_OS_WINDOWS) +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN // We only need minimal includes +# endif -+// To avoid macro definition of ERROR. -+// To avoid macro definition of min/max. -+# ifndef NOMINMAX -+# define NOMINMAX -+# endif -+ #include ++// To avoid macro definition of ERROR. +#ifdef ERROR +# undef ERROR +#endif #endif @ac_google_start_namespace@ -@@ -1061,7 +1073,7 @@ namespace google { +@@ -1061,7 +1068,7 @@ namespace google { #elif defined(GLOG_OS_WINDOWS) #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ @@ -31,7 +26,7 @@ index 3ecacfb..0bdbe6d 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ -@@ -1071,7 +1083,7 @@ namespace google { +@@ -1071,7 +1078,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ @@ -40,7 +35,7 @@ index 3ecacfb..0bdbe6d 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (condition && \ (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) || true) && \ -@@ -1082,7 +1094,7 @@ namespace google { +@@ -1082,7 +1089,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ @@ -49,7 +44,7 @@ index 3ecacfb..0bdbe6d 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ -@@ -1092,7 +1104,7 @@ namespace google { +@@ -1092,7 +1099,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 0e0d23076946ef..70c8ce97118407 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bb84d3c0e6057e00ef151afde936fa6b4fba33c9", + "git-tree": "c469b2bfc6498c37b6daad8d512a1b1d1cb6a6f6", "version": "0.5.0", "port-version": 5 }, From 979139b2850683efec95ea832d9408168c8a9af4 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 10 Jun 2022 14:45:54 +0800 Subject: [PATCH 3/6] Revert "remove NOMINMAX" This reverts commit 17a80f259dd2718a375d06c0686f69c647cf2d57. --- ports/glog/cmakelists_atomicdetect.patch | 19 +++++++++++++++ ports/glog/noerror-nominmax.patch | 31 ++++++++++++++---------- ports/glog/portfile.cmake | 2 +- versions/g-/glog.json | 2 +- 4 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 ports/glog/cmakelists_atomicdetect.patch diff --git a/ports/glog/cmakelists_atomicdetect.patch b/ports/glog/cmakelists_atomicdetect.patch new file mode 100644 index 00000000000000..d9dd4e330bd87d --- /dev/null +++ b/ports/glog/cmakelists_atomicdetect.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13c474b..34ffc06 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,6 +398,14 @@ if (HAVE_EXECINFO_H) + set (HAVE_STACKTRACE 1) + endif (HAVE_EXECINFO_H) + ++if (HAVE_CXX11_ATOMIC) ++ message(STATUS "have atomic") ++ set (ac_cv_cxx11_atomic 1) ++else () ++ message(STATUS "not have atomic") ++ set (ac_cv_cxx11_atomic 0) ++endif () ++ + if (WITH_SYMBOLIZE) + if (WIN32 OR CYGWIN) + if(CMAKE_CROSSCOMPILING) diff --git a/ports/glog/noerror-nominmax.patch b/ports/glog/noerror-nominmax.patch index 78f928b9234d0d..3a0877c9ad55d0 100644 --- a/ports/glog/noerror-nominmax.patch +++ b/ports/glog/noerror-nominmax.patch @@ -1,23 +1,28 @@ diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 3ecacfb..ebbc7d5 100644 +index 3ecacfb..033230d 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in -@@ -103,7 +103,14 @@ - #ifdef HAVE_CXX11_ATOMIC +@@ -100,10 +100,18 @@ + #include + #endif + +-#ifdef HAVE_CXX11_ATOMIC ++#if @ac_cv_cxx11_atomic@ #include #elif defined(GLOG_OS_WINDOWS) -+# ifndef WIN32_LEAN_AND_MEAN -+# define WIN32_LEAN_AND_MEAN // We only need minimal includes ++// To avoid macro definition of ERROR. ++// To avoid macro definition of min/max. ++# ifndef NOMINMAX ++# define NOMINMAX +# endif #include -+// To avoid macro definition of ERROR. -+#ifdef ERROR -+# undef ERROR -+#endif ++# ifdef ERROR ++# undef ERROR ++# endif #endif @ac_google_start_namespace@ -@@ -1061,7 +1068,7 @@ namespace google { +@@ -1061,7 +1069,7 @@ namespace google { #elif defined(GLOG_OS_WINDOWS) #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ @@ -26,7 +31,7 @@ index 3ecacfb..ebbc7d5 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ -@@ -1071,7 +1078,7 @@ namespace google { +@@ -1071,7 +1079,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ @@ -35,7 +40,7 @@ index 3ecacfb..ebbc7d5 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (condition && \ (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) || true) && \ -@@ -1082,7 +1089,7 @@ namespace google { +@@ -1082,7 +1090,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ @@ -44,7 +49,7 @@ index 3ecacfb..ebbc7d5 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ -@@ -1092,7 +1099,7 @@ namespace google { +@@ -1092,7 +1100,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 7edbb2ed7b7dd0..5988204aa76ddd 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( fix_log_every_n.patch noerror-nominmax.patch fix_crosscompile_symbolize.patch - + cmakelists_atomicdetect.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 70c8ce97118407..945f704fbca9d9 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "c469b2bfc6498c37b6daad8d512a1b1d1cb6a6f6", + "git-tree": "23a5cebc8eddfba3c2da76d3a6f46a404aa458d9", "version": "0.5.0", "port-version": 5 }, From 88fa8dd223801aa1db8318590045682d6f0c3b06 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Fri, 10 Jun 2022 20:06:27 +0800 Subject: [PATCH 4/6] fix atomic --- ports/glog/cmakelists_atomicdetect.patch | 6 ++---- ports/glog/noerror-nominmax.patch | 11 ++++++++++- versions/g-/glog.json | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/glog/cmakelists_atomicdetect.patch b/ports/glog/cmakelists_atomicdetect.patch index d9dd4e330bd87d..0b02e1a9abeecd 100644 --- a/ports/glog/cmakelists_atomicdetect.patch +++ b/ports/glog/cmakelists_atomicdetect.patch @@ -1,16 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13c474b..34ffc06 100644 +index 13c474b..7858c8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -398,6 +398,14 @@ if (HAVE_EXECINFO_H) +@@ -398,6 +398,12 @@ if (HAVE_EXECINFO_H) set (HAVE_STACKTRACE 1) endif (HAVE_EXECINFO_H) +if (HAVE_CXX11_ATOMIC) -+ message(STATUS "have atomic") + set (ac_cv_cxx11_atomic 1) +else () -+ message(STATUS "not have atomic") + set (ac_cv_cxx11_atomic 0) +endif () + diff --git a/ports/glog/noerror-nominmax.patch b/ports/glog/noerror-nominmax.patch index 3a0877c9ad55d0..57c29ad39196a3 100644 --- a/ports/glog/noerror-nominmax.patch +++ b/ports/glog/noerror-nominmax.patch @@ -1,5 +1,5 @@ diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 3ecacfb..033230d 100644 +index 3ecacfb..2698dea 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in @@ -100,10 +100,18 @@ @@ -22,6 +22,15 @@ index 3ecacfb..033230d 100644 #endif @ac_google_start_namespace@ +@@ -1014,7 +1022,7 @@ extern "C" void AnnotateBenignRaceSized( + namespace google { + #endif + +-#ifdef HAVE_CXX11_ATOMIC ++#if @ac_cv_cxx11_atomic@ + #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ + static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ + _GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ @@ -1061,7 +1069,7 @@ namespace google { #elif defined(GLOG_OS_WINDOWS) diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 945f704fbca9d9..a3c65e3af7c034 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "23a5cebc8eddfba3c2da76d3a6f46a404aa458d9", + "git-tree": "184861d554ead1dd9f9debc1cfcf0a3073875752", "version": "0.5.0", "port-version": 5 }, From 9a61dbe6cbbc870b9ee1c7fb87e77bf204010546 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Sun, 12 Jun 2022 14:26:03 +0800 Subject: [PATCH 5/6] remove nominmax --- ...inmax.patch => fix-SOME_KIND_OF_LOG.patch} | 25 ++++++------------- ports/glog/portfile.cmake | 2 +- versions/g-/glog.json | 2 +- 3 files changed, 9 insertions(+), 20 deletions(-) rename ports/glog/{noerror-nominmax.patch => fix-SOME_KIND_OF_LOG.patch} (81%) diff --git a/ports/glog/noerror-nominmax.patch b/ports/glog/fix-SOME_KIND_OF_LOG.patch similarity index 81% rename from ports/glog/noerror-nominmax.patch rename to ports/glog/fix-SOME_KIND_OF_LOG.patch index 57c29ad39196a3..7e48d2cfc32f07 100644 --- a/ports/glog/noerror-nominmax.patch +++ b/ports/glog/fix-SOME_KIND_OF_LOG.patch @@ -1,8 +1,8 @@ diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index 3ecacfb..2698dea 100644 +index 3ecacfb..ef10284 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in -@@ -100,10 +100,18 @@ +@@ -100,7 +100,7 @@ #include #endif @@ -10,19 +10,8 @@ index 3ecacfb..2698dea 100644 +#if @ac_cv_cxx11_atomic@ #include #elif defined(GLOG_OS_WINDOWS) -+// To avoid macro definition of ERROR. -+// To avoid macro definition of min/max. -+# ifndef NOMINMAX -+# define NOMINMAX -+# endif #include -+# ifdef ERROR -+# undef ERROR -+# endif - #endif - - @ac_google_start_namespace@ -@@ -1014,7 +1022,7 @@ extern "C" void AnnotateBenignRaceSized( +@@ -1014,7 +1014,7 @@ extern "C" void AnnotateBenignRaceSized( namespace google { #endif @@ -31,7 +20,7 @@ index 3ecacfb..2698dea 100644 #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ static std::atomic LOG_OCCURRENCES(0), LOG_OCCURRENCES_MOD_N(0); \ _GLOG_IFDEF_THREAD_SANITIZER(AnnotateBenignRaceSized(__FILE__, __LINE__, &LOG_OCCURRENCES, sizeof(int), "")); \ -@@ -1061,7 +1069,7 @@ namespace google { +@@ -1061,7 +1061,7 @@ namespace google { #elif defined(GLOG_OS_WINDOWS) #define SOME_KIND_OF_LOG_EVERY_N(severity, n, what_to_do) \ @@ -40,7 +29,7 @@ index 3ecacfb..2698dea 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ -@@ -1071,7 +1079,7 @@ namespace google { +@@ -1071,7 +1071,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_LOG_IF_EVERY_N(severity, condition, n, what_to_do) \ @@ -49,7 +38,7 @@ index 3ecacfb..2698dea 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (condition && \ (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) || true) && \ -@@ -1082,7 +1090,7 @@ namespace google { +@@ -1082,7 +1082,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_PLOG_EVERY_N(severity, n, what_to_do) \ @@ -58,7 +47,7 @@ index 3ecacfb..2698dea 100644 InterlockedIncrement(&LOG_OCCURRENCES); \ if (InterlockedIncrement(&LOG_OCCURRENCES_MOD_N) > n) \ InterlockedExchangeSubtract(&LOG_OCCURRENCES_MOD_N, n); \ -@@ -1092,7 +1100,7 @@ namespace google { +@@ -1092,7 +1092,7 @@ namespace google { &what_to_do).stream() #define SOME_KIND_OF_LOG_FIRST_N(severity, n, what_to_do) \ diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 5988204aa76ddd..e8b8033b6a88a6 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( glog_disable_debug_postfix.patch fix_glog_CMAKE_MODULE_PATH.patch fix_log_every_n.patch - noerror-nominmax.patch + fix-SOME_KIND_OF_LOG.patch fix_crosscompile_symbolize.patch cmakelists_atomicdetect.patch ) diff --git a/versions/g-/glog.json b/versions/g-/glog.json index a3c65e3af7c034..eb8144dd2bbb2f 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "184861d554ead1dd9f9debc1cfcf0a3073875752", + "git-tree": "b1c79ab6934cb1a24d37e2e7c0a73f486f3400c4", "version": "0.5.0", "port-version": 5 }, From f4438fe9500b367ad1bfe7bc8cc268c05da07501 Mon Sep 17 00:00:00 2001 From: jiayuehua <3423893+jiayuehua@users.noreply.github.com> Date: Sun, 12 Jun 2022 18:48:34 +0800 Subject: [PATCH 6/6] CI [skip actions]