mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[qt5-base] fix xcode 15 build (#34097)
This commit is contained in:
parent
195fe7f828
commit
0111592cf3
28
ports/qt5-base/patches/xcode-15.patch
Normal file
28
ports/qt5-base/patches/xcode-15.patch
Normal file
@ -0,0 +1,28 @@
|
||||
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
|
||||
index 0040b6c..bfad10d 100644
|
||||
--- a/mkspecs/features/toolchain.prf
|
||||
+++ b/mkspecs/features/toolchain.prf
|
||||
@@ -288,9 +288,12 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
|
||||
+ isEmpty(QMAKE_DEFAULT_INCDIRS): \
|
||||
!integrity: \
|
||||
- error("failed to parse default search paths from compiler output")
|
||||
+ error("failed to parse default include paths from compiler output")
|
||||
+ isEmpty(QMAKE_DEFAULT_LIBDIRS): \
|
||||
+ !integrity:!darwin: \
|
||||
+ error("failed to parse default library paths from compiler output")
|
||||
QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
|
||||
} else: ghs {
|
||||
cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
|
||||
@@ -411,7 +414,7 @@
|
||||
QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
|
||||
}
|
||||
|
||||
- unix:if(!cross_compile|host_build) {
|
||||
+ unix:!darwin:if(!cross_compile|host_build) {
|
||||
isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
|
||||
isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
|
||||
}
|
@ -66,6 +66,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH
|
||||
patches/mysql_plugin_include.patch #Fix include path of mysql plugin
|
||||
patches/mysql-configure.patch #Fix mysql project
|
||||
patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547
|
||||
patches/xcode-15.patch #From https://codereview.qt-project.org/c/qt/qtbase/+/503172
|
||||
#patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static).
|
||||
#Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the
|
||||
#the windows supplied gl.h header and the angle gl.h otherwise.
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "qt5-base",
|
||||
"version": "5.15.10",
|
||||
"port-version": 6,
|
||||
"port-version": 7,
|
||||
"description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
|
@ -6754,7 +6754,7 @@
|
||||
},
|
||||
"qt5-base": {
|
||||
"baseline": "5.15.10",
|
||||
"port-version": 6
|
||||
"port-version": 7
|
||||
},
|
||||
"qt5-canvas3d": {
|
||||
"baseline": "0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "0ee4e266c41088bae8b961529841eebc5696a749",
|
||||
"version": "5.15.10",
|
||||
"port-version": 7
|
||||
},
|
||||
{
|
||||
"git-tree": "3910010e49edbdf2f8a7bf917ee51f5ab888769e",
|
||||
"version": "5.15.10",
|
||||
|
Loading…
x
Reference in New Issue
Block a user