fix pkg-config for Qt inside LEDE/OpenWrt
authorMirko Vogt <mirko-dev@nanl.de>
Tue, 22 Nov 2016 12:18:15 +0000 (13:18 +0100)
committerMirko Vogt <mirko-dev@nanl.de>
Tue, 22 Nov 2016 12:41:28 +0000 (13:41 +0100)
Qt disables all pkg-config tests if it notices itself
being cross-compiled and PKG_CONFIG_SYSROOT_DIR being
unset.

However we do have a working pkg-config (wrapper around
pkg-config.real) which fixes the issues PKG_CONFIG_SYSROOT_DIR
tries to address.

Qt tries to be too smart in our case - force it to use
pkg-config.

frameworks/qt5base/patches/001-fix-pkgconfig-xcompile-detection.patch [new file with mode: 0644]

diff --git a/frameworks/qt5base/patches/001-fix-pkgconfig-xcompile-detection.patch b/frameworks/qt5base/patches/001-fix-pkgconfig-xcompile-detection.patch
new file mode 100644 (file)
index 0000000..680f289
--- /dev/null
@@ -0,0 +1,11 @@
+--- qtbase-opensource-src-5.8.0-beta/configure.pri.orig        2016-11-20 20:06:38.811897204 +0100
++++ qtbase-opensource-src-5.8.0-beta/configure.pri     2016-11-20 20:06:54.279928752 +0100
+@@ -174,7 +174,7 @@
+                     "Disabling pkg-config since PKG_CONFIG_SYSROOT_DIR is not set." \
+                     "Set this variable to your sysroot for pkg-config to function correctly when" \
+                     "cross-compiling or use -pkg-config to override this test.")
+-                return(false)
++#                return(false)
+             }
+             pkgConfigSysrootDir = $$sysroot