Skip to content

Commit e97b77d

Browse files
author
lateminer
authored
Merge pull request bitcoin#15 from michelvankessel/blackcoin-more-dev
upgrade to QT5.9.6 for depends
2 parents 1e0add9 + 3740732 commit e97b77d

9 files changed

+186
-242
lines changed

‎build-aux/m4/bitcoin_qt.m4

+92-40
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
226226
227227
228228
dnl enable qt support
229-
AC_MSG_CHECKING(whether to build ]AC_PACKAGE_NAME[ GUI)
229+
AC_MSG_CHECKING(whether to build [AC_PACKAGE_NAME] GUI)
230230
BITCOIN_QT_CHECK([
231231
bitcoin_enable_qt=yes
232232
bitcoin_enable_qt_test=yes
@@ -272,36 +272,57 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
272272
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
273273
[[#include <QtCore>]],
274274
[[
275-
#if QT_VERSION < 0x050000
276-
choke me
277-
#else
278-
return 0;
275+
#if QT_VERSION < 0x050000 || QT_VERSION_MAJOR < 5
276+
choke
279277
#endif
280278
]])],
281279
[bitcoin_cv_qt5=yes],
282280
[bitcoin_cv_qt5=no])
283281
])])
284282

283+
dnl Internal. Check if the included version of Qt is greater than Qt58.
284+
dnl Requires: INCLUDES must be populated as necessary.
285+
dnl Output: bitcoin_cv_qt5=yes|no
286+
AC_DEFUN([_BITCOIN_QT_CHECK_QT58],[
287+
AC_CACHE_CHECK(for > Qt 5.7, bitcoin_cv_qt58,[
288+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
289+
#include <QtCore/qconfig.h>
290+
#ifndef QT_VERSION
291+
# include <QtCore/qglobal.h>
292+
#endif
293+
]],
294+
[[
295+
#if QT_VERSION_MINOR < 8
296+
choke
297+
#endif
298+
]])],
299+
[bitcoin_cv_qt58=yes],
300+
[bitcoin_cv_qt58=no])
301+
])])
302+
303+
285304
dnl Internal. Check if the linked version of Qt was built as static libs.
286-
dnl Requires: Qt5. This check cannot determine if Qt4 is static.
305+
dnl Requires: Qt5.
287306
dnl Requires: INCLUDES and LIBS must be populated as necessary.
288307
dnl Output: bitcoin_cv_static_qt=yes|no
289308
dnl Output: Defines QT_STATICPLUGIN if plugins are static.
290309
AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
291310
AC_CACHE_CHECK(for static Qt, bitcoin_cv_static_qt,[
292-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
293-
[[#include <QtCore>]],
294-
[[
295-
#if defined(QT_STATIC)
296-
return 0;
297-
#else
298-
choke me
299-
#endif
300-
]])],
301-
[bitcoin_cv_static_qt=yes],
302-
[bitcoin_cv_static_qt=no])
303-
])
304-
if test xbitcoin_cv_static_qt = xyes; then
311+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
312+
#include <QtCore/qconfig.h>
313+
#ifndef QT_VERSION OR QT_VERSION_STR
314+
# include <QtCore/qglobal.h>
315+
#endif
316+
]],
317+
[[
318+
#if !defined(QT_STATIC)
319+
choke
320+
#endif
321+
]])],
322+
[bitcoin_cv_static_qt=yes],
323+
[bitcoin_cv_static_qt=no])
324+
])
325+
if test "x$bitcoin_cv_static_qt" = xyes; then
305326
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static Qt plugins])
306327
fi
307328
])
@@ -337,32 +358,59 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
337358
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible"
338359
fi
339360
fi
340-
if test x$use_pkgconfig = xyes; then
361+
if test "x$use_pkgconfig" = xyes; then
341362
: dnl
342363
m4_ifdef([PKG_CHECK_MODULES],[
343-
PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"])
344-
if test x$TARGET_OS = xlinux; then
364+
if test x$bitcoin_cv_qt58 = xno; then
365+
PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"])
366+
else
367+
PKG_CHECK_MODULES([QTEVENTDISPATCHER], [Qt5EventDispatcherSupport], [QT_LIBS="-lQt5EventDispatcherSupport $QT_LIBS"])
368+
PKG_CHECK_MODULES([QTTHEME], [Qt5ThemeSupport], [QT_LIBS="-lQt5ThemeSupport $QT_LIBS"])
369+
PKG_CHECK_MODULES([QTDEVICEDISCOVERY], [Qt5DeviceDiscoverySupport], [QT_LIBS="-lQt5DeviceDiscoverySupport $QT_LIBS"])
370+
PKG_CHECK_MODULES([QTACCESSIBILITY], [Qt5AccessibilitySupport], [QT_LIBS="-lQt5AccessibilitySupport $QT_LIBS"])
371+
PKG_CHECK_MODULES([QTFB], [Qt5FbSupport], [QT_LIBS="-lQt5FbSupport $QT_LIBS"])
372+
fi
373+
if test "x$TARGET_OS" = xlinux; then
345374
PKG_CHECK_MODULES([X11XCB], [x11-xcb], [QT_LIBS="$X11XCB_LIBS $QT_LIBS"])
346375
if ${PKG_CONFIG} --exists "Qt5Core >= 5.5" 2>/dev/null; then
347376
PKG_CHECK_MODULES([QTXCBQPA], [Qt5XcbQpa], [QT_LIBS="$QTXCBQPA_LIBS $QT_LIBS"])
348377
fi
349-
elif test x$TARGET_OS = xdarwin; then
350-
PKG_CHECK_MODULES([QTPRINT], [Qt5PrintSupport], [QT_LIBS="$QTPRINT_LIBS $QT_LIBS"])
378+
elif test "x$TARGET_OS" = xdarwin; then
379+
PKG_CHECK_MODULES([QTFONTDATABASE], [Qt5FontDatabaseSupport], [QT_LIBS="-lQt5FontDatabaseSupport $QT_LIBS"])
380+
PKG_CHECK_MODULES([QTCLIPBOARD], [Qt5ClipboardSupport], [QT_LIBS="-lQt5ClipboardSupport $QT_LIBS"])
381+
PKG_CHECK_MODULES([QTGRAPHICS], [Qt5GraphicsSupport], [QT_LIBS="-lQt5GraphicsSupport $QT_LIBS"])
382+
PKG_CHECK_MODULES([QTCGL], [Qt5CglSupport], [QT_LIBS="-lQt5CglSupport $QT_LIBS"])
351383
fi
352384
])
353385
else
354-
if test x$TARGET_OS = xwindows; then
355-
AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
356-
[[#include <QtCore>]],[[
357-
#if QT_VERSION < 0x050600
358-
choke;
359-
#endif
386+
if test "x$TARGET_OS" = xwindows; then
387+
AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[
388+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
389+
#include <QtCore/qconfig.h>
390+
#ifndef QT_VERSION
391+
# include <QtCore/qglobal.h>
392+
#endif
393+
]],
394+
[[
395+
#if QT_VERSION < 0x050600 || QT_VERSION_MINOR < 6
396+
choke
397+
#endif
360398
]])],
361399
[bitcoin_cv_need_platformsupport=yes],
362400
[bitcoin_cv_need_platformsupport=no])
363401
])
364-
if test x$bitcoin_cv_need_platformsupport = xyes; then
365-
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXPlatformSupport not found)))
402+
if test "x$bitcoin_cv_need_platformsupport" = xyes; then
403+
if test x$bitcoin_cv_qt58 = xno; then
404+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXPlatformSupport not found)))
405+
else
406+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}FontDatabaseSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXFontDatabaseSupport not found)))
407+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}EventDispatcherSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXEventDispatcherSupport not found)))
408+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}ThemeSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXThemeSupport not found)))
409+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}FbSupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXFbSupport not found)))
410+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}DeviceDiscoverySupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXDeviceDiscoverySupport not found)))
411+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}AccessibilitySupport],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXAccessibilitySupport not found)))
412+
QT_LIBS="$QT_LIBS -lversion -ldwmapi -luxtheme"
413+
fi
366414
fi
367415
fi
368416
fi
@@ -453,6 +501,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
453501
BITCOIN_QT_CHECK([
454502
if test x$bitcoin_qt_want_version = xauto; then
455503
_BITCOIN_QT_CHECK_QT5
504+
_BITCOIN_QT_CHECK_QT58
456505
fi
457506
if test x$bitcoin_cv_qt5 = xyes || test x$bitcoin_qt_want_version = xqt5; then
458507
QT_LIB_PREFIX=Qt5
@@ -475,16 +524,19 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
475524
])
476525
477526
BITCOIN_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in])))
478-
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
479527
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in])))
480-
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in])))
481-
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
482-
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXCore not found)))
483-
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXGui not found)))
484-
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXNetwork not found)))
485-
if test x$bitcoin_qt_got_major_vers = x5; then
486-
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,BITCOIN_QT_FAIL(lib$QT_LIB_PREFIXWidgets not found)))
528+
if test x$bitcoin_cv_qt58 = xno; then
529+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
530+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in])))
531+
else
532+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtlibpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
533+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre2_match_16], [qtpcre2 libqtpcre2],,AC_MSG_WARN([libqtpcre2 not found. Assuming qt has it built-in])))
487534
fi
535+
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng qtharfbuzz harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
536+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Core not found)))
537+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found)))
538+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Network not found)))
539+
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Widgets not found)))
488540
QT_LIBS="$LIBS"
489541
LIBS="$TEMP_LIBS"
490542

‎depends/packages/qt.mk

+24-30
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
PACKAGE=qt
2-
$(package)_version=5.7.1
3-
$(package)_download_path=http://download.qt.io/official_releases/qt/5.7/$($(package)_version)/submodules
4-
$(package)_suffix=opensource-src-$($(package)_version).tar.gz
2+
$(package)_version=5.9.6
3+
$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
4+
$(package)_suffix=opensource-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
6+
$(package)_sha256_hash=eed620cb268b199bd83b3fc6a471c51d51e1dc2dbb5374fc97a0cc75facbe36f
77
$(package)_dependencies=openssl zlib
88
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
99
$(package)_build_subdir=qtbase
1010
$(package)_qt_libs=corelib network widgets gui plugins testlib
11-
$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch
11+
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch
1212

1313
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
14-
$(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
15-
14+
$(package)_qttranslations_sha256_hash=9822084f8e2d2939ba39f4af4c0c2320e45d5996762a9423f833055607604ed8
1615

1716
$(package)_qttools_file_name=qttools-$($(package)_suffix)
18-
$(package)_qttools_sha256_hash=22d67de915cb8cd93e16fdd38fa006224ad9170bd217c2be1e53045a8dd02f0f
17+
$(package)_qttools_sha256_hash=50e75417ec0c74bb8b1989d1d8e981ee83690dce7dfc0c2169f7c00f397e5117
1918

2019
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2120
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -28,25 +27,18 @@ $(package)_config_opts += -c++std c++11
2827
$(package)_config_opts += -confirm-license
2928
$(package)_config_opts += -dbus-runtime
3029
$(package)_config_opts += -hostprefix $(build_prefix)
31-
$(package)_config_opts += -no-alsa
32-
$(package)_config_opts += -no-audio-backend
3330
$(package)_config_opts += -no-cups
3431
$(package)_config_opts += -no-egl
3532
$(package)_config_opts += -no-eglfs
36-
$(package)_config_opts += -no-feature-style-windowsmobile
37-
$(package)_config_opts += -no-feature-style-windowsce
3833
$(package)_config_opts += -no-freetype
3934
$(package)_config_opts += -no-gif
4035
$(package)_config_opts += -no-glib
41-
$(package)_config_opts += -no-gstreamer
4236
$(package)_config_opts += -no-icu
4337
$(package)_config_opts += -no-iconv
4438
$(package)_config_opts += -no-kms
4539
$(package)_config_opts += -no-linuxfb
4640
$(package)_config_opts += -no-libudev
47-
$(package)_config_opts += -no-mitshm
4841
$(package)_config_opts += -no-mtdev
49-
$(package)_config_opts += -no-pulseaudio
5042
$(package)_config_opts += -no-openvg
5143
$(package)_config_opts += -no-reduce-relocations
5244
$(package)_config_opts += -no-qml-debug
@@ -61,7 +53,6 @@ $(package)_config_opts += -no-sql-sqlite
6153
$(package)_config_opts += -no-sql-sqlite2
6254
$(package)_config_opts += -no-use-gold-linker
6355
$(package)_config_opts += -no-xinput2
64-
$(package)_config_opts += -no-xrender
6556
$(package)_config_opts += -nomake examples
6657
$(package)_config_opts += -nomake tests
6758
$(package)_config_opts += -opensource
@@ -74,12 +65,13 @@ $(package)_config_opts += -qt-libpng
7465
$(package)_config_opts += -qt-libjpeg
7566
$(package)_config_opts += -qt-pcre
7667
$(package)_config_opts += -system-zlib
77-
$(package)_config_opts += -reduce-exports
7868
$(package)_config_opts += -static
7969
$(package)_config_opts += -silent
8070
$(package)_config_opts += -v
8171
$(package)_config_opts += -no-feature-printer
8272
$(package)_config_opts += -no-feature-printdialog
73+
$(package)_config_opts += -no-feature-concurrent
74+
$(package)_config_opts += -no-feature-xml
8375

8476
ifneq ($(build_os),darwin)
8577
$(package)_config_opts_darwin = -xplatform macx-clang-linux
@@ -94,11 +86,12 @@ endif
9486
$(package)_config_opts_linux = -qt-xkbcommon
9587
$(package)_config_opts_linux += -qt-xcb
9688
$(package)_config_opts_linux += -system-freetype
97-
$(package)_config_opts_linux += -no-sm
89+
$(package)_config_opts_linux += -no-feature-sessionmanager
9890
$(package)_config_opts_linux += -fontconfig
9991
$(package)_config_opts_linux += -no-opengl
100-
$(package)_config_opts_arm_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
92+
$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
10193
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
94+
$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
10295
$(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
10396
$(package)_build_env = QT_RCC_TEST=1
10497
endef
@@ -123,11 +116,10 @@ define $(package)_extract_cmds
123116
tar --strip-components=1 -xf $($(package)_source_dir)/$($(package)_qttools_file_name) -C qttools
124117
endef
125118

126-
127119
define $(package)_preprocess_cmds
128120
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
129121
sed -i.old "/updateqm.depends =/d" qttranslations/translations/translations.pro && \
130-
sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
122+
sed -i.old "s/src_plugins.depends = src_sql src_network/src_plugins.depends = src_network/" qtbase/src/src.pro && \
131123
sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
132124
sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \
133125
sed -i.old 's/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0)/CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft)/' qtbase/src/plugins/platforms/cocoa/qcocoacursor.mm && \
@@ -138,18 +130,17 @@ define $(package)_preprocess_cmds
138130
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
139131
cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/bitcoin-linux-g++ && \
140132
sed -i s/arm-linux-gnueabi-/$(host)-/g qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \
141-
patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
142-
patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
143-
patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
144-
patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
145-
patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
133+
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
134+
patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
135+
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
146136
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
147137
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
148138
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
139+
echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
140+
echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\
149141
sed -i.old "s|QMAKE_CFLAGS = |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
150142
sed -i.old "s|QMAKE_LFLAGS = |!host_build: QMAKE_LFLAGS = $($(package)_ldflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \
151143
sed -i.old "s|QMAKE_CXXFLAGS = |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf
152-
153144
endef
154145

155146
define $(package)_config_cmds
@@ -161,19 +152,22 @@ define $(package)_config_cmds
161152
echo "CONFIG += force_bootstrap" >> mkspecs/qconfig.pri && \
162153
$(MAKE) sub-src-clean && \
163154
cd ../qttranslations && ../qtbase/bin/qmake qttranslations.pro -o Makefile && \
164-
cd translations && ../../qtbase/bin/qmake translations.pro -o Makefile && cd ../.. &&\
165-
cd qttools/src/linguist/lrelease/ && ../../../../qtbase/bin/qmake lrelease.pro -o Makefile
155+
cd translations && ../../qtbase/bin/qmake translations.pro -o Makefile && cd ../.. && \
156+
cd qttools/src/linguist/lrelease/ && ../../../../qtbase/bin/qmake lrelease.pro -o Makefile && \
157+
cd ../lupdate/ && ../../../../qtbase/bin/qmake lupdate.pro -o Makefile && cd ../../../..
166158
endef
167159

168160
define $(package)_build_cmds
169161
$(MAKE) -C src $(addprefix sub-,$($(package)_qt_libs)) && \
170162
$(MAKE) -C ../qttools/src/linguist/lrelease && \
163+
$(MAKE) -C ../qttools/src/linguist/lupdate && \
171164
$(MAKE) -C ../qttranslations
172165
endef
173166

174167
define $(package)_stage_cmds
175-
$(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && cd .. &&\
168+
$(MAKE) -C src INSTALL_ROOT=$($(package)_staging_dir) $(addsuffix -install_subtargets,$(addprefix sub-,$($(package)_qt_libs))) && cd .. && \
176169
$(MAKE) -C qttools/src/linguist/lrelease INSTALL_ROOT=$($(package)_staging_dir) install_target && \
170+
$(MAKE) -C qttools/src/linguist/lupdate INSTALL_ROOT=$($(package)_staging_dir) install_target && \
177171
$(MAKE) -C qttranslations INSTALL_ROOT=$($(package)_staging_dir) install_subtargets && \
178172
if `test -f qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a`; then \
179173
cp qtbase/src/plugins/platforms/xcb/xcb-static/libxcb-static.a $($(package)_staging_prefix_dir)/lib; \

0 commit comments

Comments
 (0)