+++ /dev/null
-From 7d20d5e4584abce2353557c90e79ee0b3cdc330e Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 27 Feb 2015 19:51:55 +0100
-Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- tools/qmake/mkspecs/features/configure.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
-index 6e74b55..b91fde8 100644
---- a/tools/qmake/mkspecs/features/configure.prf
-+++ b/tools/qmake/mkspecs/features/configure.prf
-@@ -20,7 +20,7 @@ defineTest(runConfigure) {
- qtCompileTest($$test)
- }
- # libcap-dev package doesn't ship .pc files on Ubuntu.
-- linux:!config_libcap:skipBuild("libcap appears to be missing")
-+ #linux:!config_libcap:skipBuild("libcap appears to be missing")
- contains(QT_CONFIG, xcb) {
- for(package, $$list("libdrm xcomposite xi xrandr")) {
- !packagesExist($$package):skipBuild("Unmet dependency: $$package")
---
-2.3.1
-
do_configure() {
# replace LD with CXX, to workaround a possible gyp inheritssue?
- LD="${CXX}" export LD
- CC="${CC}" export CC
- CXX="${CXX}" export CXX
- CC_host="gcc" export CC_host
- CXX_host="g++" export CXX_host
+ export LD="${CXX}"
+ export CC="${CC}"
+ export CXX="${CXX}"
+ export CC_host="gcc"
+ export CXX_host="g++"
+ export QMAKE_MAKE_ARGS="${EXTRA_OEMAKE}"
# qmake can't find the OE_QMAKE_* variables on it's own so directly passing them as
# arguments here
+++ /dev/null
-From 1306df17fccb672e95911398740d48408488035a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Fri, 27 Feb 2015 19:51:55 +0100
-Subject: [PATCH 4/4] configure.prf: don't fail when libcap test fails
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- tools/qmake/mkspecs/features/configure.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
-index 6e74b55..b91fde8 100644
---- a/tools/qmake/mkspecs/features/configure.prf
-+++ b/tools/qmake/mkspecs/features/configure.prf
-@@ -20,7 +20,7 @@ defineTest(runConfigure) {
- qtCompileTest($$test)
- }
- # libcap-dev package doesn't ship .pc files on Ubuntu.
-- linux:!config_libcap:skipBuild("libcap appears to be missing")
-+ #linux:!config_libcap:skipBuild("libcap appears to be missing")
- contains(QT_CONFIG, xcb) {
- for(package, $$list("libdrm xcomposite xi xrandr")) {
- !packagesExist($$package):skipBuild("Unmet dependency: $$package")
---
-2.3.1
-
file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
- file://0004-configure.prf-don-t-fail-when-libcap-test-fails.patch \
file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
"
file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
- file://0004-configure.prf-don-t-fail-when-libcap-test-fails.patch \
file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
"
SRCREV_qtwebengine = "4eceed9ac0b646238e76d77569a619d4dc515ba5"