diff options
author | Eric BENARD <eric@eukrea.com> | 2013-05-27 23:43:50 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-28 10:42:38 +0200 |
commit | 712d678c3accc499af0f1fc4d0d55359787b6009 (patch) | |
tree | 55d9d6854010eac113afc25ed1dcee32fb1efb15 | |
parent | 440e7829dccd48ef249a7314ebee00d4e3a584c5 (diff) | |
download | meta-qt5-712d678c3accc499af0f1fc4d0d55359787b6009.tar.gz |
qtbase-5.0.2: fix v8 and allow build of examples
- fix v8 segfault (at least on armv7)
- examples are only provided as sources but in our case, binaries
are more interesting for user to test the features on the target.
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch | 49 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_5.0.2.bb | 4 |
2 files changed, 53 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch new file mode 100644 index 00000000..17b951a3 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-qtbase-allow-build-of-examples.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 66558b78b5ff8c8ae9fa00a33d1d89285b8e3a00 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
3 | Date: Sat, 25 May 2013 17:34:32 +0200 | ||
4 | Subject: [PATCH] qtbase: allow build of examples | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | this revert the following commit : | ||
10 | |||
11 | commit 2b397f985e4ef6ae5c0571a928bb1320fb048c61 | ||
12 | Author: Oswald Buddenhagen <oswald.buddenhagen@digia.com> | ||
13 | Date: Fri Dec 21 19:36:12 2012 +0100 | ||
14 | |||
15 | do not actually build examples in production builds | ||
16 | |||
17 | -developer-build enables an actual build of examples, based on the | ||
18 | assumption that developers want to test it (it can be still disabled | ||
19 | with -nomake examples). regular users otoh want only the examples | ||
20 | sources installed. | ||
21 | |||
22 | Change-Id: Ifc6a108099929175a3960480802b271a758fdd38 | ||
23 | Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> | ||
24 | |||
25 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
26 | --- | ||
27 | mkspecs/features/qt_example_installs.prf | 8 -------- | ||
28 | 1 file changed, 8 deletions(-) | ||
29 | |||
30 | diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf | ||
31 | index 479a16a..ca1b0c7 100644 | ||
32 | --- a/mkspecs/features/qt_example_installs.prf | ||
33 | +++ b/mkspecs/features/qt_example_installs.prf | ||
34 | @@ -92,12 +92,4 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) | ||
35 | allfiles -= doc | ||
36 | !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") | ||
37 | } | ||
38 | - | ||
39 | - # Do not actually build the examples in production builds with -prefix | ||
40 | - !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { | ||
41 | - TEMPLATE = aux | ||
42 | - CONFIG -= have_target qt staticlib dll | ||
43 | - SOURCES = | ||
44 | - INSTALLS -= target | ||
45 | - } | ||
46 | } | ||
47 | -- | ||
48 | 1.8.1.4 | ||
49 | |||
diff --git a/recipes-qt/qt5/qtbase_5.0.2.bb b/recipes-qt/qt5/qtbase_5.0.2.bb index 3df434e3..357c06e7 100644 --- a/recipes-qt/qt5/qtbase_5.0.2.bb +++ b/recipes-qt/qt5/qtbase_5.0.2.bb | |||
@@ -3,5 +3,9 @@ require ${PN}.inc | |||
3 | 3 | ||
4 | PR = "${INC_PR}.0" | 4 | PR = "${INC_PR}.0" |
5 | 5 | ||
6 | SRC_URI += "file://0004-Disable-mkv8snapshot.patch \ | ||
7 | file://0001-qtbase-allow-build-of-examples.patch \ | ||
8 | " | ||
9 | |||
6 | SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" | 10 | SRC_URI[md5sum] = "a4fec8ed03867c4ee4fe5a46001a11f0" |
7 | SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" | 11 | SRC_URI[sha256sum] = "31851ee2f844c100554506a9a446d4b6abb5270bca799c2a683e5f937456a9c8" |