diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 11:24:01 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-07-24 13:42:12 -0300 |
| commit | 4e55b2b2e3e7d1df7cfb4e0b72fc4af04afd6c24 (patch) | |
| tree | bceb40f0841f591e8dd00647fd536cb98d9d2ea7 /meta-qt5/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch | |
| parent | 4957bd6096a9520bb6fdd2985f5e4370e7a6ad95 (diff) | |
| download | tizen-distro-4e55b2b2e3e7d1df7cfb4e0b72fc4af04afd6c24.tar.gz tizen-distro-4e55b2b2e3e7d1df7cfb4e0b72fc4af04afd6c24.tar.bz2 tizen-distro-4e55b2b2e3e7d1df7cfb4e0b72fc4af04afd6c24.zip | |
recipes-git: update to latest revisions in 5.4 branch
(From meta-qt5 rev: acbb72d884aecb02de29006081fa55efe8cac9f8)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'meta-qt5/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch')
| -rw-r--r-- | meta-qt5/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-qt5/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch b/meta-qt5/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch new file mode 100644 index 0000000000..6a2162f4cf --- /dev/null +++ b/meta-qt5/recipes-qt/qt5/qtwebengine-git/0004-configure.prf-don-t-fail-when-libcap-test-fails.patch @@ -0,0 +1,26 @@ +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 + |