diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2017-06-16 07:10:12 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2017-06-16 09:56:32 (GMT) |
| commit | ede738758e34fca6bff735e472d63e5e06024654 (patch) | |
| tree | 6ab38fba86fd5ffad7e2716270c70324ccf5408a /src | |
| parent | 49c892298d4d0624bfb8a0ad212950c9ec474dc1 (diff) | |
| download | mxe-ede738758e34fca6bff735e472d63e5e06024654.zip mxe-ede738758e34fca6bff735e472d63e5e06024654.tar.gz mxe-ede738758e34fca6bff735e472d63e5e06024654.tar.bz2 | |
qtbase: prevent extra leading / on system include and lib directories
PKG_CONFIG_SYSROOT should not be set because MXE uses fully
qualified paths. However, to satisfy the Qt build system's
cross-compiling "sanity check", qtbase.mk defines
PKG_CONFIG_SYSROOT_DIR=/
This causes pkg-config to prefix the system include and library
paths with an extra /. Pkg-config does not strip these prefixed
paths from --cflags and --libs output. The workaround here is
to remove the PKG_CONFIG_SYSROOT_DIR definition in the wrapper
script for pkg-config.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pkgconf.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/pkgconf.mk b/src/pkgconf.mk index 2bdab5f..14a67bd 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -22,6 +22,7 @@ define $(PKG)_BUILD # create pkg-config script (echo '#!/bin/sh'; \ echo 'PKG_CONFIG_PATH="$(PREFIX)/$(TARGET)/qt5/lib/pkgconfig":"$$PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))" \ + PKG_CONFIG_SYSROOT_DIR= \ PKG_CONFIG_LIBDIR="$(PREFIX)/$(TARGET)/lib/pkgconfig" \ PKG_CONFIG_SYSTEM_INCLUDE_PATH="$(PREFIX)/$(TARGET)/include" \ exec "$(PREFIX)/$(BUILD)/bin/pkgconf" $(if $(BUILD_STATIC),--static) "$$@"') \ |