summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-08-14 15:17:25 +0200
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-08-24 13:34:12 +0000
commit937ff1c56be6bb0a3ef296b92fd1f2326b99dca9 (patch)
treeb65f7ec4afb70dbc23722fe192c8afa274b5f2f2 /tools
parenta42c618053748d988fab0b93497a1fc9cdd12b69 (diff)
Fix the build on embedded linux
This patch: - adds required options to the embedded_linux.pri config - adds missing events_ozone.gyp:events_ozone_evdev dependency - fixes pkg-config not to pick host paths when cross compiling - implements missing functions of the OzonePlatform interface - updates the submodule to include fixes for chromium Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildscripts/gyp_qtwebengine5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index 116f8f2bd..39d9cc4b4 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -86,6 +86,11 @@ if __name__ == '__main__':
if 'qt_cross_compile=1' in sys.argv:
os.environ['GYP_CROSSCOMPILE'] = '1'
+ sysroot = 'sysroot='
+ for opt in sys.argv:
+ if opt.startswith(sysroot):
+ os.environ['PKG_CONFIG_SYSROOT_DIR'] = opt[len(sysroot):]
+
gyp_helper.apply_chromium_gyp_env()
# This could give false positives since it doesn't actually do real option