From: Michael Wallner <mike@php.net>
Date: Wed, 3 Feb 2021 14:12:13 +0000 (+0100)
Subject: fix #108: macOS Big Sur: dtrace does not understand -G switch
X-Git-Tag: 1.1.0-beta3~6
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=fd750dc118447f388093f042d34fd66bd2700869;p=m6w6%2Flibmemcached

fix #108: macOS Big Sur: dtrace does not understand -G switch
---

diff --git a/CMake/EnableDtrace.cmake b/CMake/EnableDtrace.cmake
index d9b902ba..ea7499d7 100644
--- a/CMake/EnableDtrace.cmake
+++ b/CMake/EnableDtrace.cmake
@@ -30,7 +30,10 @@ function(enable_dtrace_for TARGET PROBES_D PROBES_H)
             set_source_files_properties(${TARGET}_probes.o PROPERTIES
                     GENERATED true
                     EXTERNAL_OBJECT true)
-        else() # not Linux
+            return()
+        endif()
+        cmake_host_system_information(RESULT OS_RELEASE QUERY OS_RELEASE)
+        if(NOT (CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin AND OS_RELEASE VERSION_GREATER_EQUAL 11))
             set(PROBES_C ${TARGET}_probes.cc)
             file(GENERATE
                     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PROBES_C}
diff --git a/ChangeLog-1.1.md b/ChangeLog-1.1.md
index 02090ca2..2c5a94fc 100644
--- a/ChangeLog-1.1.md
+++ b/ChangeLog-1.1.md
@@ -6,6 +6,8 @@
 
 **Changes from beta2:**
 
+* Fix [gh #108](https://github.com/m6w6/libmemcached/issues/105):
+  macOS Big Sur: dtrace does not understand -G switch
 * Fix libmemcachedprotocol's binary `STAT` and `VERSION` handlers.
 * Fix [gh #105](https://github.com/m6w6/libmemcached/issues/105):
   EINTR handled too defensively when polling.
diff --git a/docs/source/ChangeLog-1.1.rst b/docs/source/ChangeLog-1.1.rst
index ab6458c9..fc38c83d 100644
--- a/docs/source/ChangeLog-1.1.rst
+++ b/docs/source/ChangeLog-1.1.rst
@@ -16,6 +16,8 @@ v 1.1.0-beta3
 **Changes from beta2:**
 
 
+* Fix `gh #108 <https://github.com/m6w6/libmemcached/issues/105>`_\ :
+  macOS Big Sur: dtrace does not understand -G switch
 * Fix libmemcachedprotocol's binary ``STAT`` and ``VERSION`` handlers.
 * Fix `gh #105 <https://github.com/m6w6/libmemcached/issues/105>`_\ :
   EINTR handled too defensively when polling.