[libuuid] disallow on osx (#22306)

The `uuid/uuid.h` header conflicts with system libraries on osx; some system headers include `<uuid/uuid.h>`, intending to get the macOS system headers.
microsoft · Jan 12, 2022 · b13e043 · b13e043
1 parent d7e919b
commit b13e043
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 35 deletions.
diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
   "supports": "!(uwp | osx)",
   "dependencies": [
     "apr",
     {
       "name": "libuuid",
-      "platform": "!windows"
+      "platform": "!windows & !osx"
     }
   ]
 }
diff --git a/ports/drogon/mac-system-uuid.patch b/ports/drogon/mac-system-uuid.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake_modules/FindUUID.cmake b/cmake_modules/FindUUID.cmake
+index 31bad4c..2532829 100755
+--- a/cmake_modules/FindUUID.cmake
++++ b/cmake_modules/FindUUID.cmake
+@@ -76,18 +76,18 @@ else(UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
+                      /opt/lib
+                      /usr/freeware/lib64)
+
+-  if(NOT UUID_LIBRARY AND BSD)
++  if(NOT UUID_LIBRARY AND (BSD OR APPLE))
+     set(UUID_LIBRARY "")
+-  endif(NOT UUID_LIBRARY AND BSD)
++  endif()
+
+   set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
+   set(UUID_LIBRARIES ${UUID_LIBRARY})
+
+   if(UUID_INCLUDE_DIRS)
+-    if(BSD OR UUID_LIBRARIES)
++    if((BSD OR APPLE) OR UUID_LIBRARIES)
+       set(UUID_FOUND TRUE)
+-    endif(BSD OR UUID_LIBRARIES)
+-  endif(UUID_INCLUDE_DIRS)
++    endif()
++  endif()
+
+   if(UUID_FOUND)
+     if(NOT UUID_FIND_QUIETLY)
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
         drogon_config.patch
         static-brotli.patch
         fs.patch
+        mac-system-uuid.patch
         use-libmariadb.patch
 )
 

diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "drogon",
   "version-semver": "1.7.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
   "homepage": "https://github.com/an-tao/drogon",
   "documentation": "https://drogon.docsforge.com/master/overview/",
@@ -11,7 +11,7 @@
     "jsoncpp",
     {
       "name": "libuuid",
-      "platform": "!windows"
+      "platform": "!windows & !osx"
     },
     "trantor",
     {

diff --git a/ports/ignition-common3/vcpkg.json b/ports/ignition-common3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ignition-common3",
   "version-string": "3.9.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Common libraries for robotics applications",
   "homepage": "https://ignitionrobotics.org/libs/common",
   "dependencies": [
@@ -17,7 +17,7 @@
     "ignition-modularscripts",
     {
       "name": "libuuid",
-      "platform": "!windows & !uwp"
+      "platform": "!windows & !uwp & !osx"
     },
     "tinyxml2"
   ]

diff --git a/ports/ignition-transport4/vcpkg.json b/ports/ignition-transport4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ignition-transport4",
   "version-string": "4.0.0",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Transport middleware for robotics",
   "dependencies": [
     "cppzmq",
@@ -10,7 +10,7 @@
     "ignition-msgs1",
     {
       "name": "libuuid",
-      "platform": "!windows & !uwp"
+      "platform": "!windows & !uwp & !osx"
     },
     "protobuf",
     "zeromq"

diff --git a/ports/ignition-transport8/vcpkg.json b/ports/ignition-transport8/vcpkg.json
@@ -1,15 +1,15 @@
 {
   "name": "ignition-transport8",
   "version-string": "8.1.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Transport middleware for robotics",
   "dependencies": [
     "cppzmq",
     "ignition-cmake2",
     "ignition-msgs5",
     {
       "name": "libuuid",
-      "platform": "!windows & !uwp"
+      "platform": "!windows & !uwp & !osx"
     },
     "protobuf",
     "sqlite3",

diff --git a/ports/ignition-transport9/vcpkg.json b/ports/ignition-transport9/vcpkg.json
@@ -1,15 +1,15 @@
 {
   "name": "ignition-transport9",
   "version-string": "9.0.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Transport middleware for robotics",
   "dependencies": [
     "cppzmq",
     "ignition-cmake2",
     "ignition-msgs6",
     {
       "name": "libuuid",
-      "platform": "!windows & !uwp"
+      "platform": "!windows & !uwp & !osx"
     },
     "protobuf",
     "sqlite3",

diff --git a/ports/libhdfs3/vcpkg.json b/ports/libhdfs3/vcpkg.json
@@ -1,12 +1,15 @@
 {
   "name": "libhdfs3",
   "version-string": "2019-11-05",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation",
   "homepage": "https://github.com/erikmuttersbach/libhdfs3",
   "dependencies": [
     "boost",
-    "libuuid",
+    {
+      "name": "libuuid",
+      "platform": "!windows & !osx"
+    },
     "libxml2",
     "protobuf"
   ]

diff --git a/ports/libuuid/vcpkg.json b/ports/libuuid/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "libuuid",
   "version": "1.0.3",
-  "port-version": 9,
+  "port-version": 10,
   "description": "Universally unique id library",
   "homepage": "https://sourceforge.net/projects/libuuid",
-  "supports": "linux | osx"
+  "supports": "!osx & !windows"
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -584,6 +584,7 @@ libhdfs3:x64-windows-static=fail
 libhdfs3:x64-windows-static-md=fail
 libhdfs3:x86-windows=fail
 libhdfs3:x64-linux=fail
+libhdfs3:x64-osx=fail
 libhydrogen:arm64-windows=fail
 libics:arm-uwp=fail
 libics:x64-uwp=fail
@@ -721,17 +722,6 @@ libusb-win32:arm-uwp=fail
 libusb-win32:x64-linux=fail
 libusb-win32:x64-osx=fail
 libusb-win32:x64-uwp=fail
-libuuid:arm64-windows=fail
-libuuid:arm-uwp=fail
-
-# Causes build failures in vxl and podofo on osx
-# Conflicts with Darwin kernel sdk uuid.h (has missing definitions)
-libuuid:x64-osx = skip
-libuuid:x64-uwp=fail
-libuuid:x64-windows=fail
-libuuid:x64-windows-static=fail
-libuuid:x64-windows-static-md=fail
-libuuid:x86-windows=fail
 libuv:arm-uwp=fail
 libuv:x64-uwp=fail
 libvmdk:arm-uwp=fail

diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ec8c68847a3d3950cec058e76a3963fac34fd682",
+      "version-semver": "3.9.5",
+      "port-version": 8
+    },
     {
       "git-tree": "531d21bab7c2d9e9e2ecb1c84e6cf9f1c6173a51",
       "version-semver": "3.9.5",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -22,7 +22,7 @@
     },
     "activemq-cpp": {
       "baseline": "3.9.5",
-      "port-version": 7
+      "port-version": 8
     },
     "ade": {
       "baseline": "0.1.1f",
@@ -1906,7 +1906,7 @@
     },
     "drogon": {
       "baseline": "1.7.4",
-      "port-version": 1
+      "port-version": 2
     },
     "dtl": {
       "baseline": "1.19",
@@ -2774,7 +2774,7 @@
     },
     "ignition-common3": {
       "baseline": "3.9.0",
-      "port-version": 1
+      "port-version": 2
     },
     "ignition-fuel-tools1": {
       "baseline": "1.2.0",
@@ -2814,15 +2814,15 @@
     },
     "ignition-transport4": {
       "baseline": "4.0.0",
-      "port-version": 3
+      "port-version": 4
     },
     "ignition-transport8": {
       "baseline": "8.1.0",
-      "port-version": 1
+      "port-version": 2
     },
     "ignition-transport9": {
       "baseline": "9.0.0",
-      "port-version": 1
+      "port-version": 2
     },
     "igraph": {
       "baseline": "0.9.6",
@@ -3538,7 +3538,7 @@
     },
     "libhdfs3": {
       "baseline": "2019-11-05",
-      "port-version": 1
+      "port-version": 2
     },
     "libheif": {
       "baseline": "1.12.0",
@@ -4042,7 +4042,7 @@
     },
     "libuuid": {
       "baseline": "1.0.3",
-      "port-version": 9
+      "port-version": 10
     },
     "libuv": {
       "baseline": "1.42.0",

diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b7be1868461c479ff45609e892bc5de9adf42258",
+      "version-semver": "1.7.4",
+      "port-version": 2
+    },
     {
       "git-tree": "e5e1c950e966613f9b867570346f9458bff71826",
       "version-semver": "1.7.4",

diff --git a/versions/i-/ignition-common3.json b/versions/i-/ignition-common3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ee01029f1822c107fb6654c440aad50f5e5b97d3",
+      "version-string": "3.9.0",
+      "port-version": 2
+    },
     {
       "git-tree": "f576cb30e5369daf724e9465dd29ef496f327283",
       "version-string": "3.9.0",

diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
+      "version-string": "4.0.0",
+      "port-version": 4
+    },
     {
       "git-tree": "1df4d0fec30b796611ef0840f4b74a7008d6c1fb",
       "version-string": "4.0.0",

diff --git a/versions/i-/ignition-transport8.json b/versions/i-/ignition-transport8.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "10fb9c7619753767ea31b84db43272712730f32c",
+      "version-string": "8.1.0",
+      "port-version": 2
+    },
     {
       "git-tree": "0841028ca6e8959f60f38c082d998b84dc273910",
       "version-string": "8.1.0",

diff --git a/versions/i-/ignition-transport9.json b/versions/i-/ignition-transport9.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0829d67a63010fca7f587ca7370db716570aa969",
+      "version-string": "9.0.0",
+      "port-version": 2
+    },
     {
       "git-tree": "263d88cb08544cb6fc3ff459c24a12832c0fdcb0",
       "version-string": "9.0.0",

diff --git a/versions/l-/libhdfs3.json b/versions/l-/libhdfs3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "440244ba92f1f0b67d7246f707df2545f477f3f4",
+      "version-string": "2019-11-05",
+      "port-version": 2
+    },
     {
       "git-tree": "21db40c50744011ba13568f8e3a72dd97de84ea9",
       "version-string": "2019-11-05",

diff --git a/versions/l-/libuuid.json b/versions/l-/libuuid.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "47283ef4bb45ef38cfd61160bc1cec2d69e572b4",
+      "version": "1.0.3",
+      "port-version": 10
+    },
     {
       "git-tree": "a545c6c9bf405bd60cb97d6e2086f1273f5a3321",
       "version": "1.0.3",