[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.
This commit is contained in:
autoantwort 2022-01-12 20:33:38 +01:00 committed by GitHub
parent d7e919b978
commit b13e043b70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 97 additions and 35 deletions

View File

@ -1,14 +1,14 @@
{ {
"name": "activemq-cpp", "name": "activemq-cpp",
"version-semver": "3.9.5", "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.", "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
"supports": "!(uwp | osx)", "supports": "!(uwp | osx)",
"dependencies": [ "dependencies": [
"apr", "apr",
{ {
"name": "libuuid", "name": "libuuid",
"platform": "!windows" "platform": "!windows & !osx"
} }
] ]
} }

View File

@ -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)

View File

@ -9,6 +9,7 @@ vcpkg_from_github(
drogon_config.patch drogon_config.patch
static-brotli.patch static-brotli.patch
fs.patch fs.patch
mac-system-uuid.patch
use-libmariadb.patch use-libmariadb.patch
) )

View File

@ -1,7 +1,7 @@
{ {
"name": "drogon", "name": "drogon",
"version-semver": "1.7.4", "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", "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
"homepage": "https://github.com/an-tao/drogon", "homepage": "https://github.com/an-tao/drogon",
"documentation": "https://drogon.docsforge.com/master/overview/", "documentation": "https://drogon.docsforge.com/master/overview/",
@ -11,7 +11,7 @@
"jsoncpp", "jsoncpp",
{ {
"name": "libuuid", "name": "libuuid",
"platform": "!windows" "platform": "!windows & !osx"
}, },
"trantor", "trantor",
{ {

View File

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

View File

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

View File

@ -1,7 +1,7 @@
{ {
"name": "ignition-transport8", "name": "ignition-transport8",
"version-string": "8.1.0", "version-string": "8.1.0",
"port-version": 1, "port-version": 2,
"description": "Transport middleware for robotics", "description": "Transport middleware for robotics",
"dependencies": [ "dependencies": [
"cppzmq", "cppzmq",
@ -9,7 +9,7 @@
"ignition-msgs5", "ignition-msgs5",
{ {
"name": "libuuid", "name": "libuuid",
"platform": "!windows & !uwp" "platform": "!windows & !uwp & !osx"
}, },
"protobuf", "protobuf",
"sqlite3", "sqlite3",

View File

@ -1,7 +1,7 @@
{ {
"name": "ignition-transport9", "name": "ignition-transport9",
"version-string": "9.0.0", "version-string": "9.0.0",
"port-version": 1, "port-version": 2,
"description": "Transport middleware for robotics", "description": "Transport middleware for robotics",
"dependencies": [ "dependencies": [
"cppzmq", "cppzmq",
@ -9,7 +9,7 @@
"ignition-msgs6", "ignition-msgs6",
{ {
"name": "libuuid", "name": "libuuid",
"platform": "!windows & !uwp" "platform": "!windows & !uwp & !osx"
}, },
"protobuf", "protobuf",
"sqlite3", "sqlite3",

View File

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

View File

@ -1,8 +1,8 @@
{ {
"name": "libuuid", "name": "libuuid",
"version": "1.0.3", "version": "1.0.3",
"port-version": 9, "port-version": 10,
"description": "Universally unique id library", "description": "Universally unique id library",
"homepage": "https://sourceforge.net/projects/libuuid", "homepage": "https://sourceforge.net/projects/libuuid",
"supports": "linux | osx" "supports": "!osx & !windows"
} }

View File

@ -584,6 +584,7 @@ libhdfs3:x64-windows-static=fail
libhdfs3:x64-windows-static-md=fail libhdfs3:x64-windows-static-md=fail
libhdfs3:x86-windows=fail libhdfs3:x86-windows=fail
libhdfs3:x64-linux=fail libhdfs3:x64-linux=fail
libhdfs3:x64-osx=fail
libhydrogen:arm64-windows=fail libhydrogen:arm64-windows=fail
libics:arm-uwp=fail libics:arm-uwp=fail
libics:x64-uwp=fail libics:x64-uwp=fail
@ -721,17 +722,6 @@ libusb-win32:arm-uwp=fail
libusb-win32:x64-linux=fail libusb-win32:x64-linux=fail
libusb-win32:x64-osx=fail libusb-win32:x64-osx=fail
libusb-win32:x64-uwp=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:arm-uwp=fail
libuv:x64-uwp=fail libuv:x64-uwp=fail
libvmdk:arm-uwp=fail libvmdk:arm-uwp=fail

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ec8c68847a3d3950cec058e76a3963fac34fd682",
"version-semver": "3.9.5",
"port-version": 8
},
{ {
"git-tree": "531d21bab7c2d9e9e2ecb1c84e6cf9f1c6173a51", "git-tree": "531d21bab7c2d9e9e2ecb1c84e6cf9f1c6173a51",
"version-semver": "3.9.5", "version-semver": "3.9.5",

View File

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

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "b7be1868461c479ff45609e892bc5de9adf42258",
"version-semver": "1.7.4",
"port-version": 2
},
{ {
"git-tree": "e5e1c950e966613f9b867570346f9458bff71826", "git-tree": "e5e1c950e966613f9b867570346f9458bff71826",
"version-semver": "1.7.4", "version-semver": "1.7.4",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "ee01029f1822c107fb6654c440aad50f5e5b97d3",
"version-string": "3.9.0",
"port-version": 2
},
{ {
"git-tree": "f576cb30e5369daf724e9465dd29ef496f327283", "git-tree": "f576cb30e5369daf724e9465dd29ef496f327283",
"version-string": "3.9.0", "version-string": "3.9.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "24af2dccedbb77ff7f1d514871f291776fd7a86f",
"version-string": "4.0.0",
"port-version": 4
},
{ {
"git-tree": "1df4d0fec30b796611ef0840f4b74a7008d6c1fb", "git-tree": "1df4d0fec30b796611ef0840f4b74a7008d6c1fb",
"version-string": "4.0.0", "version-string": "4.0.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "10fb9c7619753767ea31b84db43272712730f32c",
"version-string": "8.1.0",
"port-version": 2
},
{ {
"git-tree": "0841028ca6e8959f60f38c082d998b84dc273910", "git-tree": "0841028ca6e8959f60f38c082d998b84dc273910",
"version-string": "8.1.0", "version-string": "8.1.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0829d67a63010fca7f587ca7370db716570aa969",
"version-string": "9.0.0",
"port-version": 2
},
{ {
"git-tree": "263d88cb08544cb6fc3ff459c24a12832c0fdcb0", "git-tree": "263d88cb08544cb6fc3ff459c24a12832c0fdcb0",
"version-string": "9.0.0", "version-string": "9.0.0",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "440244ba92f1f0b67d7246f707df2545f477f3f4",
"version-string": "2019-11-05",
"port-version": 2
},
{ {
"git-tree": "21db40c50744011ba13568f8e3a72dd97de84ea9", "git-tree": "21db40c50744011ba13568f8e3a72dd97de84ea9",
"version-string": "2019-11-05", "version-string": "2019-11-05",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "47283ef4bb45ef38cfd61160bc1cec2d69e572b4",
"version": "1.0.3",
"port-version": 10
},
{ {
"git-tree": "a545c6c9bf405bd60cb97d6e2086f1273f5a3321", "git-tree": "a545c6c9bf405bd60cb97d6e2086f1273f5a3321",
"version": "1.0.3", "version": "1.0.3",