From da3b8e741183d8287a82c38de7ccbe389ccd9ac9 Mon Sep 17 00:00:00 2001
From: Sergiu Deitsch <sergiu.deitsch@gmail.com>
Date: Thu, 4 Jan 2024 02:11:37 +0100
Subject: [PATCH] cmake: determine when to use port.h

Allow building using MSYS2 (without MinGW).
---
 CMakeLists.txt               | 12 ++++++++++--
 bazel/glog.bzl               |  1 +
 src/stacktrace_windows-inl.h |  4 +++-
 src/utilities.h              |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b2e52c1b..c1223777f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -363,12 +363,14 @@ set (GLOG_SRCS
   src/vlog_is_on.cc
 )
 
-if (CYGWIN OR WIN32)
+# NOTE MSYS2 defines both WIN32 and UNIX. Do not use windows port in this case.
+if ((CYGWIN OR WIN32) AND NOT UNIX)
   list (APPEND GLOG_SRCS
     src/windows/port.cc
     src/windows/port.h
   )
-endif (CYGWIN OR WIN32)
+  set (_glog_USE_WINDOWS_PORT TRUE)
+endif ((CYGWIN OR WIN32) AND NOT UNIX)
 
 add_library (glog_internal OBJECT
   ${_glog_BINARY_CMake_MODULES}
@@ -399,6 +401,12 @@ set (glog_libraries_options_for_static_linking)
 # CMake always uses the generated export header
 target_compile_definitions (glog PUBLIC GLOG_USE_GLOG_EXPORT)
 
+if (_glog_USE_WINDOWS_PORT)
+  target_compile_definitions (glog PRIVATE GLOG_USE_WINDOWS_PORT)
+endif (_glog_USE_WINDOWS_PORT)
+
+unset (_glog_USE_WINDOWS_PORT)
+
 if (WIN32)
   # Do not define min and max as macros
   target_compile_definitions (glog PRIVATE NOMINMAX)
diff --git a/bazel/glog.bzl b/bazel/glog.bzl
index 2f248d0b7..dca92953d 100644
--- a/bazel/glog.bzl
+++ b/bazel/glog.bzl
@@ -104,6 +104,7 @@ def glog_library(with_gflags = 1, **kwargs):
         "-DGLOG_EXPORT=__declspec(dllexport)",
         "-DGLOG_NO_EXPORT=",
         "-DGLOG_NO_ABBREVIATED_SEVERITIES",
+        "-DGLOG_USE_WINDOWS_PORT",
         "-DHAVE__CHSIZE_S",
         "-I" + src_windows,
     ]
diff --git a/src/stacktrace_windows-inl.h b/src/stacktrace_windows-inl.h
index fedbad099..851c9bb11 100644
--- a/src/stacktrace_windows-inl.h
+++ b/src/stacktrace_windows-inl.h
@@ -34,7 +34,9 @@
 #include <dbghelp.h>
 
 #include "config.h"
-#include "port.h"
+#if defined(GLOG_USE_WINDOWS_PORT)
+#  include "port.h"
+#endif
 #include "stacktrace.h"
 
 namespace google {
diff --git a/src/utilities.h b/src/utilities.h
index 50b4bece3..fc272652f 100644
--- a/src/utilities.h
+++ b/src/utilities.h
@@ -57,7 +57,7 @@
 
 #include "glog/logging.h"
 
-#if defined(GLOG_OS_WINDOWS)
+#if defined(GLOG_USE_WINDOWS_PORT)
 #  include "port.h"
 #endif