From 183f781cd689802874e9f56f10b3e5591b0914a7 Mon Sep 17 00:00:00 2001
From: Cristian Ungureanu <cristian.ungureanu@gmail.com>
Date: Mon, 29 Nov 2021 15:20:04 +0200
Subject: Support for MacOS 10.12 Monterey - Intel build.

---
 ACE/include/makeinclude/platform_macosx.GNU          | 13 ++++++++++---
 ACE/include/makeinclude/platform_macosx_monterey.GNU |  2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 ACE/include/makeinclude/platform_macosx_monterey.GNU

diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU
index 9aba3d6c0b9..c957969dddc 100644
--- a/ACE/include/makeinclude/platform_macosx.GNU
+++ b/ACE/include/makeinclude/platform_macosx.GNU
@@ -24,6 +24,8 @@ MACOS_CODENAME_VER_11_0   := bigsur
 MACOS_CODENAME_VER_11_1   := bigsur
 MACOS_CODENAME_VER_11_2   := bigsur
 MACOS_CODENAME_VER_11_latest := bigsur
+MACOS_CODENAME_VER_12_0   := monterey
+MACOS_CODENAME_VER_12_latest := monterey
 
 MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION))
 
@@ -42,10 +44,15 @@ else ifeq ($(MACOS_MAJOR_VERSION),11)
     ## just use the latest known version
     MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest)
   endif
+else ifeq ($(MACOS_MAJOR_VERSION),12)
+  ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 2; echo $$?),0)
+    ## if the detected version is greater than the latest know version,
+    ## just use the latest known version
+    MACOS_CODENAME = $(MACOS_CODENAME_VER_12_latest)
+  endif
 else
-  ## if the detected version is greater than the latest know version,
-  ## just use the latest known version
-  MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest)
+  ## Unsupported major version
+  $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION))
 endif
 
 include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU
diff --git a/ACE/include/makeinclude/platform_macosx_monterey.GNU b/ACE/include/makeinclude/platform_macosx_monterey.GNU
new file mode 100644
index 00000000000..6ec0ad0d5fe
--- /dev/null
+++ b/ACE/include/makeinclude/platform_macosx_monterey.GNU
@@ -0,0 +1,2 @@
+include $(ACE_ROOT)/include/makeinclude/platform_macosx_bigsur.GNU
+
-- 
cgit v1.2.1


From acd22a1811e54c53472c15600c541922d779569f Mon Sep 17 00:00:00 2001
From: Cristian Ungureanu <cristian.ungureanu@gmail.com>
Date: Mon, 29 Nov 2021 15:41:53 +0200
Subject: Will fallback to macOS 12 (latest) if on higher OS.

---
 ACE/include/makeinclude/platform_macosx.GNU | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU
index c957969dddc..aad2df12a20 100644
--- a/ACE/include/makeinclude/platform_macosx.GNU
+++ b/ACE/include/makeinclude/platform_macosx.GNU
@@ -52,7 +52,7 @@ else ifeq ($(MACOS_MAJOR_VERSION),12)
   endif
 else
   ## Unsupported major version
-  $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION))
+  MACOS_CODENAME = $(MACOS_CODENAME_VER_12_latest)
 endif
 
 include $(ACE_ROOT)/include/makeinclude/platform_macosx_$(MACOS_CODENAME).GNU
-- 
cgit v1.2.1


From 5d5cf9581bfb7fb92df367ea326b18c5b71cc4e4 Mon Sep 17 00:00:00 2001
From: Cristian Ungureanu <cristian.ungureanu@gmail.com>
Date: Tue, 30 Nov 2021 09:43:01 +0200
Subject: Fixed a minor OS version comparison error.

---
 ACE/include/makeinclude/platform_macosx.GNU | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU
index aad2df12a20..ca08204574f 100644
--- a/ACE/include/makeinclude/platform_macosx.GNU
+++ b/ACE/include/makeinclude/platform_macosx.GNU
@@ -45,13 +45,13 @@ else ifeq ($(MACOS_MAJOR_VERSION),11)
     MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest)
   endif
 else ifeq ($(MACOS_MAJOR_VERSION),12)
-  ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 2; echo $$?),0)
+  ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 0; echo $$?),0)
     ## if the detected version is greater than the latest know version,
     ## just use the latest known version
     MACOS_CODENAME = $(MACOS_CODENAME_VER_12_latest)
   endif
 else
-  ## Unsupported major version
+  ## Unsupported major version -- will fallback to the last known version.
   MACOS_CODENAME = $(MACOS_CODENAME_VER_12_latest)
 endif
 
-- 
cgit v1.2.1