diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-12-15 17:52:47 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-01-23 17:00:53 +0000 |
| commit | d502c6e9d09803dd268100f8c53cf7bc563e3d1d (patch) | |
| tree | f998c3179401c09e4399015b19e34593f12ef3c5 /configure.json | |
| parent | 3cec2ccb0ffdd41a41ab55d4c1ba88d4866e71d1 (diff) | |
Add pkg-host wrapper script
Currently we need pkg-config host for cross-builds to build
build tools. Unfortunately if build environment exports
PKG_CONFIG_* variables pkg-config will pick them up also for host builds,
which can lead to compile errors. Create pkg-config-host_wrapper
which explicitly unsets PKG_CONFIG_* variables.
This is a temporary workaround till proper solution is implemented
in qtbase.
Task-number: QTBUG-65079
Change-Id: I9aff4a27ba62e096ed4c023cf022a41833260178
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 7ef1f5003..fecd83ed4 100644 --- a/configure.json +++ b/configure.json @@ -223,6 +223,11 @@ "type": "detectPython2", "log": "location" }, + "webengine-host-pkg-config": { + "label": "host pkg-config", + "type": "detectHostPkgConfig", + "log": "path" + }, "webengine-gperf": { "label": "gperf", "type": "detectGperf" @@ -355,6 +360,14 @@ { "type": "varAssign", "name": "QMAKE_PYTHON2", "value": "tests.webengine-python2.location" } ] }, + "webengine-host-pkg-config": { + "label": "host-pkg-config", + "condition": "config.unix && tests.webengine-host-pkg-config", + "output": [ + "privateFeature", + { "type": "varAssign", "name": "QMAKE_PKG_CONFIG_HOST", "value": "tests.webengine-host-pkg-config.path" } + ] + }, "webengine-gperf": { "label": "gperf", "condition": "tests.webengine-gperf", @@ -566,6 +579,11 @@ "type": "warning", "condition": "config.sanitizer && !tests.webengine-sanitizer && !features.webengine-sanitizer", "message": "Qt WebEngine cannot be built with the chosen sanitizer configuration. Check config.log for details or use -feature-webengine-sanitizer to force the build." + }, + { + "type": "warning", + "condition": "config.unix && !features.webengine-host-pkg-config", + "message": "host pkg-config not found" } ], |