aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2017-01-13 18:29:18 -0500
committerfanquake <fanquake@gmail.com>2017-01-14 14:23:48 +0800
commitc37ea4d403817c16e6b080d126b0a53c9930154d (patch)
treeb27453dee3168e306c9e74891bb75969c7b3a207
parent2b32dea50316723cf9ea6f458c2a326705c9ea04 (diff)
depends: fix qt translations build
Their buildsystem insists on using the installed ltranslate, but gets confused about how to find it. Since we manually control the build order, just drop the dependency.
-rw-r--r--depends/packages/qt.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 545e1ea707..383ef2dae6 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -124,6 +124,7 @@ endef
define $(package)_preprocess_cmds
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
+ sed -i.old "/updateqm.depends =/d" qttranslations/translations/translations.pro && \
sed -i.old "s/src_plugins.depends = src_sql src_xml src_network/src_plugins.depends = src_xml src_network/" qtbase/src/src.pro && \
sed -i.old "s|X11/extensions/XIproto.h|X11/X.h|" qtbase/src/plugins/platforms/xcb/qxcbxsettings.cpp && \
sed -i.old 's/if \[ "$$$$XPLATFORM_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/if \[ "$$$$BUILD_ON_MAC" = "yes" \]; then xspecvals=$$$$(macSDKify/' qtbase/configure && \