-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(#20093) qt5: fix build with apple-clang 15 + add package_type + bump…
… deps + use version range for zlib * fix qmake build with apple-clang 15 * fix build with apple-clang 15 when deployment target of macOS is < 14 see https://bugreports.qt.io/browse/QTBUG-114316 * improve robustness of macOS builds when deps are shared * add package_type * use is_msvc_static_runtime() * use host_version for wayland in build requirements * bump dependencies + use version range for zlib * decrease min conan v2 version, 2.0.5 is enough for <host_version> * adapt patches to each version * bump dependencies * also patch 5.15.11
- Loading branch information
Showing
6 changed files
with
222 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
recipes/qt/5.x.x/patches/5.15.10-fix-macos-cpp-lib-memory-resource.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| --- a/src/corelib/global/qcompilerdetection.h | ||
| +++ b/src/corelib/global/qcompilerdetection.h | ||
| @@ -1050,16 +1050,22 @@ | ||
| # endif // !_HAS_CONSTEXPR | ||
| # endif // !__GLIBCXX__ && !_LIBCPP_VERSION | ||
| # endif // Q_OS_QNX | ||
| -# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \ | ||
| - && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) | ||
| +# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) | ||
| +# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) | ||
| // Apple has not updated libstdc++ since 2007, which means it does not have | ||
| // <initializer_list> or std::move. Let's disable these features | ||
| -# undef Q_COMPILER_INITIALIZER_LISTS | ||
| -# undef Q_COMPILER_RVALUE_REFS | ||
| -# undef Q_COMPILER_REF_QUALIFIERS | ||
| +# undef Q_COMPILER_INITIALIZER_LISTS | ||
| +# undef Q_COMPILER_RVALUE_REFS | ||
| +# undef Q_COMPILER_REF_QUALIFIERS | ||
| // Also disable <atomic>, since it's clearly not there | ||
| -# undef Q_COMPILER_ATOMICS | ||
| -# endif | ||
| +# undef Q_COMPILER_ATOMICS | ||
| +# endif | ||
| +# if defined(__cpp_lib_memory_resource) \ | ||
| + && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \ | ||
| + || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000)) | ||
| +# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17 | ||
| +# endif | ||
| +# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) | ||
| # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500 | ||
| // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode | ||
| // (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some | ||
| --- a/src/corelib/tools/qduplicatetracker_p.h | ||
| +++ b/src/corelib/tools/qduplicatetracker_p.h | ||
| @@ -52,7 +52,7 @@ | ||
|
|
||
| #include <qglobal.h> | ||
|
|
||
| -#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L | ||
| +#if defined(__cpp_lib_memory_resource) && __cplusplus > 201402L | ||
| # include <unordered_set> | ||
| # include <memory_resource> | ||
| #else |
43 changes: 43 additions & 0 deletions
43
recipes/qt/5.x.x/patches/5.15.7-fix-macos-cpp-lib-memory-resource.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| --- a/src/corelib/global/qcompilerdetection.h | ||
| +++ b/src/corelib/global/qcompilerdetection.h | ||
| @@ -1041,16 +1041,22 @@ | ||
| # endif // !_HAS_CONSTEXPR | ||
| # endif // !__GLIBCXX__ && !_LIBCPP_VERSION | ||
| # endif // Q_OS_QNX | ||
| -# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \ | ||
| - && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) | ||
| +# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) | ||
| +# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) | ||
| // Apple has not updated libstdc++ since 2007, which means it does not have | ||
| // <initializer_list> or std::move. Let's disable these features | ||
| -# undef Q_COMPILER_INITIALIZER_LISTS | ||
| -# undef Q_COMPILER_RVALUE_REFS | ||
| -# undef Q_COMPILER_REF_QUALIFIERS | ||
| +# undef Q_COMPILER_INITIALIZER_LISTS | ||
| +# undef Q_COMPILER_RVALUE_REFS | ||
| +# undef Q_COMPILER_REF_QUALIFIERS | ||
| // Also disable <atomic>, since it's clearly not there | ||
| -# undef Q_COMPILER_ATOMICS | ||
| -# endif | ||
| +# undef Q_COMPILER_ATOMICS | ||
| +# endif | ||
| +# if defined(__cpp_lib_memory_resource) \ | ||
| + && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \ | ||
| + || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000)) | ||
| +# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17 | ||
| +# endif | ||
| +# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) | ||
| # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500 | ||
| // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode | ||
| // (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some | ||
| --- a/src/corelib/tools/qduplicatetracker_p.h | ||
| +++ b/src/corelib/tools/qduplicatetracker_p.h | ||
| @@ -52,7 +52,7 @@ | ||
|
|
||
| #include <qglobal.h> | ||
|
|
||
| -#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L | ||
| +#if defined(__cpp_lib_memory_resource) && __cplusplus > 201402L | ||
| # include <unordered_set> | ||
| # include <memory_resource> | ||
| #else |
26 changes: 26 additions & 0 deletions
26
recipes/qt/5.x.x/patches/5.15.7-fix-qmake-default-libdirs-apple-clang-15.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| --- a/mkspecs/features/toolchain.prf | ||
| +++ b/mkspecs/features/toolchain.prf | ||
| @@ -283,9 +283,12 @@ isEmpty($${target_prefix}.INCDIRS) { | ||
| } | ||
| } | ||
| } | ||
| - 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 | ||
| @@ -407,7 +410,7 @@ isEmpty($${target_prefix}.INCDIRS) { | ||
| 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 | ||
| } |
Oops, something went wrong.