mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
[depends] Fix Qt compilation with Xcode 8
This commit is contained in:
parent
2f71490d21
commit
5776e8a596
@ -8,7 +8,7 @@ $(package)_dependencies=openssl
|
|||||||
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
|
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
|
||||||
$(package)_build_subdir=qtbase
|
$(package)_build_subdir=qtbase
|
||||||
$(package)_qt_libs=corelib network widgets gui plugins testlib
|
$(package)_qt_libs=corelib network widgets gui plugins testlib
|
||||||
$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
|
$(package)_patches=mac-qmake.conf configure-xcoderun.patch mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
|
||||||
|
|
||||||
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
|
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
|
||||||
$(package)_qttranslations_sha256_hash=dcc1534d247babca1840cb6d0a000671801a341ea352d0535474f86adadaf028
|
$(package)_qttranslations_sha256_hash=dcc1534d247babca1840cb6d0a000671801a341ea352d0535474f86adadaf028
|
||||||
@ -134,6 +134,7 @@ define $(package)_preprocess_cmds
|
|||||||
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
|
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
|
||||||
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
|
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
|
||||||
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
|
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
|
||||||
|
patch -p1 < $($(package)_patch_dir)/configure-xcoderun.patch && \
|
||||||
patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
|
patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
|
||||||
patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
|
patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
|
||||||
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
|
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
|
||||||
|
25
depends/patches/qt/configure-xcoderun.patch
Normal file
25
depends/patches/qt/configure-xcoderun.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
--- old/qtbase/configure
|
||||||
|
+++ new/qtbase/configure
|
||||||
|
@@ -543,7 +543,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
- if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
|
||||||
|
+ if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
|
||||||
|
echo >&2
|
||||||
|
echo " Xcode not set up properly. You may need to confirm the license" >&2
|
||||||
|
echo " agreement by running /usr/bin/xcodebuild without arguments." >&2
|
||||||
|
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
|
||||||
|
index 0cc8cd6..5df99d1 100644
|
||||||
|
--- old/qtbase/mkspecs/features/mac/default_pre.prf
|
||||||
|
+++ new/qtbase/mkspecs/features/mac/default_pre.prf
|
||||||
|
@@ -12,7 +12,7 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
|
||||||
|
error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
|
||||||
|
|
||||||
|
# Make sure Xcode is set up properly
|
||||||
|
- isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
|
||||||
|
+ isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
|
||||||
|
error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
Loading…
Reference in New Issue
Block a user