qtwebengine: disable autodetection from sysroot
PATCH 1/1 qtwebengine: disable autodetection from sysroot
* bundled nspr fails to build when system nss is used
| work/i586-oe-linux/qtwebengine/5.5.99+5.6.0-alpha1+gitAUTOINC+64dc919d31_7e655fbb76-r0/git/src/3rdparty/chromium/third_party/nss/nspr/pr/include/md/_unixos.h:596:9: error: unknown type name 'off64_t' | typedef off64_t _MDOff64_t; | ^
* addin qtlocation to resolve:
WARNING: Failure to find: git/src/core/Release/obj/src/core/QtWebEngineCore.location_provider_qt.o
Signed-off-by Martin Jansa <[email protected]>
--- recipes-qt/qt5/qtwebengine_git.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
recipes-qt/qt5/qtwebengine_git.bb +18 -0
@@ -13,6 +13,7 @@ DEPENDS += " \ ninja-native \ qtwebchannel \ qtbase qtdeclarative qtxmlpatterns qtquickcontrols \ + qtlocation \ libdrm fontconfig pixman openssl pango cairo icu pciutils \ libcap \ "
@@ -28,6 +29,20 @@ DEPENDS += "flac" DEPENDS += "yasm-native" EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm" +DEPENDS += "libwebp" +EXTRA_QMAKEVARS_PRE += "WEBENGINE_CONFIG+=use_system_libwebp" +DEPENDS += "libxslt" +EXTRA_QMAKEVARS_PRE += "WEBENGINE_CONFIG+=use_system_libxslt" +DEPENDS += "libevent" +EXTRA_QMAKEVARS_PRE += "WEBENGINE_CONFIG+=use_system_libevent" +DEPENDS += "flac" +EXTRA_QMAKEVARS_PRE += "WEBENGINE_CONFIG+=use_system_flac" +DEPENDS += "speex" +EXTRA_QMAKEVARS_PRE += "WEBENGINE_CONFIG+=use_system_speex" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[opus] = "WEBENGINE_CONFIG+=use_system_opus,,libopus" + COMPATIBLE_MACHINE = "(-)" COMPATIBLE_MACHINE_x86 = "(.*)" COMPATIBLE_MACHINE_x86-64 = "(.*)"
@@ -57,6 +72,9 @@ do_configure() { export CXX_host="g++" export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}" + # Disable autodetection from sysroot: + sed -i 's/packagesExist([^)]*vpx[^)]*):/false:/g; s/config_srtp:/false:/g; s/config_snappy:/false:/g; s/packagesExist(nss):/false:/a; s/^ *packagesExist\($$package\):/false:/g' ${S}/tools/qmake/mkspecs/features/configure.prf + # qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as # arguments here ${OE_QMAKE_QMAKE} -r ${EXTRA_QMAKEVARS_PRE} QTWEBENGINE_ROOT="${S}" \
Signature · 1 line
2.6.2