Skip to content

[glog] Glog nominmax #24538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 5 commits into from
Jun 6, 2022
Merged

[glog] Glog nominmax #24538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cad3645
Fix building errors of glog
whuaegeanse May 4, 2022
3b48bd2
Bump the port version of glog
whuaegeanse May 4, 2022
6bab0f1
Update version database
whuaegeanse May 5, 2022
39756d7
Fix building errors
whuaegeanse Jun 2, 2022
2706d3d
Update version database
whuaegeanse Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ports/glog/fix-windows-CXX11_ATOMIC.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
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 <gflags/gflags.h>
#endif

+#ifdef GLOG_OS_WINDOWS
+#ifndef HAVE_CXX11_ATOMIC
+#define HAVE_CXX11_ATOMIC
+#endif
+#endif
+
#ifdef HAVE_CXX11_ATOMIC
#include <atomic>
#elif defined(GLOG_OS_WINDOWS)
59 changes: 0 additions & 59 deletions ports/glog/nogdi-nominmax.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ports/glog/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ vcpkg_from_github(
glog_disable_debug_postfix.patch
fix_glog_CMAKE_MODULE_PATH.patch
fix_log_every_n.patch
nogdi-nominmax.patch
fix-windows-CXX11_ATOMIC.patch
fix_crosscompile_symbolize.patch

)
Expand Down
2 changes: 1 addition & 1 deletion ports/glog/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "glog",
"version": "0.5.0",
"port-version": 3,
"port-version": 4,
"description": "C++ implementation of the Google logging module",
"homepage": "https://github.com/google/glog",
"license": "BSD-3-Clause",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,7 +2554,7 @@
},
"glog": {
"baseline": "0.5.0",
"port-version": 3
"port-version": 4
},
"gloo": {
"baseline": "20201203",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/glog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "bb5f54eba990cc0f03c64e1d09f343dd6cd7b22b",
"version": "0.5.0",
"port-version": 4
},
{
"git-tree": "ecb04a5ba4d046af782f62ae7c167bd05b0101a8",
"version": "0.5.0",
Expand Down