* [meta-qt5][PATCH dora v2 0/3] A couple of backport for dora
@ 2014-02-27 22:20 Nicolas Dechesne
2014-02-27 22:20 ` [meta-qt5][PATCH dora v2 1/3] qtbase.inc: don't force ARM_INSTRUCTION_SET to arm Nicolas Dechesne
0 siblings, 1 reply; 5+ messages in thread
From: Nicolas Dechesne @ 2014-02-27 22:20 UTC (permalink / raw)
To: openembedded-devel; +Cc: Nicolas Dechesne
Hi Martin,
the following commits were recently merged in master branch. I have
rebased/backported on dora and tested on ARM board. Only 1 minor had
to be resolved. Can you please merge them in dora branch?
Changes in v2:
- cleanup commit message in 0003, as per Martin request.
thanks
nico
Andre McCurdy (3):
qtbase.inc: don't force ARM_INSTRUCTION_SET to arm
qtbase: configure with -openssl-linked instead of -openssl
qtwebkit-examples: add RDEPENDS for ca-certificates
recipes-qt/qt5/qt5.inc | 2 ++
recipes-qt/qt5/qtbase.inc | 10 +++++-----
recipes-qt/qt5/qtwebkit-examples.inc | 1 +
3 files changed, 8 insertions(+), 5 deletions(-)
--
1.9.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [meta-qt5][PATCH dora v2 1/3] qtbase.inc: don't force ARM_INSTRUCTION_SET to arm
2014-02-27 22:20 [meta-qt5][PATCH dora v2 0/3] A couple of backport for dora Nicolas Dechesne
@ 2014-02-27 22:20 ` Nicolas Dechesne
2014-02-27 22:20 ` [meta-qt5][PATCH dora v2 2/3] qtbase: configure with -openssl-linked instead of -openssl Nicolas Dechesne
0 siblings, 1 reply; 5+ messages in thread
From: Nicolas Dechesne @ 2014-02-27 22:20 UTC (permalink / raw)
To: openembedded-devel; +Cc: Nicolas Dechesne
From: Andre McCurdy <armccurdy@gmail.com>
Forcing ARM_INSTRUCTION_SET to arm when building qtbase no longer
seems to be required.
Confirmed by forcing ARM_INSTRUCTION_SET to thumb and building
qtbase 5.1.1 and 5.2.1 tuned for both armv4t and cortexa9thf-neon.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
recipes-qt/qt5/qtbase.inc | 3 ---
1 file changed, 3 deletions(-)
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 71da726..e4beafd 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -130,9 +130,6 @@ QT_CONFIG_FLAGS += " \
${EXTRA_OECONF} \
"
-# Qt uses atomic instructions not supported in thumb mode
-ARM_INSTRUCTION_SET = "arm"
-
do_generate_qt_config_file_append() {
cat >> ${QT_CONF_PATH} <<EOF
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-qt5][PATCH dora v2 2/3] qtbase: configure with -openssl-linked instead of -openssl
2014-02-27 22:20 ` [meta-qt5][PATCH dora v2 1/3] qtbase.inc: don't force ARM_INSTRUCTION_SET to arm Nicolas Dechesne
@ 2014-02-27 22:20 ` Nicolas Dechesne
2014-02-27 22:20 ` [meta-qt5][PATCH dora v2 3/3] qtwebkit-examples: add RDEPENDS for ca-certificates Nicolas Dechesne
0 siblings, 1 reply; 5+ messages in thread
From: Nicolas Dechesne @ 2014-02-27 22:20 UTC (permalink / raw)
To: openembedded-devel; +Cc: Nicolas Dechesne
From: Andre McCurdy <armccurdy@gmail.com>
Configure qtbase with -openssl-linked (instead of -openssl) to ensure
that run-time dependencies on libcryto and libssl are detected.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
recipes-qt/qt5/qtbase.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index e4beafd..4f81f8e 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -114,7 +114,8 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
# needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}"
PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
-PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl"
+# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected
+PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl"
PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib"
PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio"
PACKAGECONFIG[nis] = "-nis,-no-nis"
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-qt5][PATCH dora v2 3/3] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-27 22:20 ` [meta-qt5][PATCH dora v2 2/3] qtbase: configure with -openssl-linked instead of -openssl Nicolas Dechesne
@ 2014-02-27 22:20 ` Nicolas Dechesne
0 siblings, 0 replies; 5+ messages in thread
From: Nicolas Dechesne @ 2014-02-27 22:20 UTC (permalink / raw)
To: openembedded-devel; +Cc: Nicolas Dechesne
From: Andre McCurdy <armccurdy@gmail.com>
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
recipes-qt/qt5/qt5.inc | 2 ++
recipes-qt/qt5/qtbase.inc | 4 +++-
recipes-qt/qt5/qtwebkit-examples.inc | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 7669efc..d9ebbff 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -7,6 +7,8 @@ inherit qmake5
ICU = "icu "
ICU_powerpc = "pango"
+PACKAGECONFIG_OPENSSL ?= "openssl"
+
QT_MODULE ?= "${BPN}"
# we don't want conflicts with qt4
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 4f81f8e..eb22e40 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -43,6 +43,8 @@ PACKAGECONFIG_FONTS ?= ""
PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
PACKAGECONFIG_DISTRO ?= ""
+# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency
+# PACKAGECONFIG_OPENSSL ?= "openssl"
PACKAGECONFIG ??= " \
release \
@@ -50,7 +52,7 @@ PACKAGECONFIG ??= " \
udev \
evdev \
widgets \
- openssl \
+ ${PACKAGECONFIG_OPENSSL} \
${PACKAGECONFIG_GL} \
${PACKAGECONFIG_FB} \
${PACKAGECONFIG_X11} \
diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc
index 50c28cd..84f16a4 100644
--- a/recipes-qt/qt5/qtwebkit-examples.inc
+++ b/recipes-qt/qt5/qtwebkit-examples.inc
@@ -10,3 +10,4 @@ SRC_URI += " \
DEPENDS += "qtwebkit"
RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
+RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-qt5][PATCH dora v2 3/3] qtwebkit-examples: add RDEPENDS for ca-certificates
2014-02-27 22:15 ` [meta-qt5][PATCH dora v2 2/3] qtbase: configure with -openssl-linked instead of -openssl Nicolas Dechesne
@ 2014-02-27 22:16 ` Nicolas Dechesne
0 siblings, 0 replies; 5+ messages in thread
From: Nicolas Dechesne @ 2014-02-27 22:16 UTC (permalink / raw)
To: openembedded-devel; +Cc: Nicolas Dechesne
From: Andre McCurdy <armccurdy@gmail.com>
If qtbase is configured with openssl support then the
qtwebkit browser example apps require CA certificates.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Conflicts:
recipes-qt/qt5/qtbase.inc
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
recipes-qt/qt5/qt5.inc | 2 ++
recipes-qt/qt5/qtbase.inc | 4 +++-
recipes-qt/qt5/qtwebkit-examples.inc | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 7669efc..d9ebbff 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -7,6 +7,8 @@ inherit qmake5
ICU = "icu "
ICU_powerpc = "pango"
+PACKAGECONFIG_OPENSSL ?= "openssl"
+
QT_MODULE ?= "${BPN}"
# we don't want conflicts with qt4
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 4f81f8e..eb22e40 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -43,6 +43,8 @@ PACKAGECONFIG_FONTS ?= ""
PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
PACKAGECONFIG_DISTRO ?= ""
+# This is in qt5.inc, because qtwebkit-examples are using it to enable ca-certificates dependency
+# PACKAGECONFIG_OPENSSL ?= "openssl"
PACKAGECONFIG ??= " \
release \
@@ -50,7 +52,7 @@ PACKAGECONFIG ??= " \
udev \
evdev \
widgets \
- openssl \
+ ${PACKAGECONFIG_OPENSSL} \
${PACKAGECONFIG_GL} \
${PACKAGECONFIG_FB} \
${PACKAGECONFIG_X11} \
diff --git a/recipes-qt/qt5/qtwebkit-examples.inc b/recipes-qt/qt5/qtwebkit-examples.inc
index 50c28cd..84f16a4 100644
--- a/recipes-qt/qt5/qtwebkit-examples.inc
+++ b/recipes-qt/qt5/qtwebkit-examples.inc
@@ -10,3 +10,4 @@ SRC_URI += " \
DEPENDS += "qtwebkit"
RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
+RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
--
1.9.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-02-27 22:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-27 22:20 [meta-qt5][PATCH dora v2 0/3] A couple of backport for dora Nicolas Dechesne
2014-02-27 22:20 ` [meta-qt5][PATCH dora v2 1/3] qtbase.inc: don't force ARM_INSTRUCTION_SET to arm Nicolas Dechesne
2014-02-27 22:20 ` [meta-qt5][PATCH dora v2 2/3] qtbase: configure with -openssl-linked instead of -openssl Nicolas Dechesne
2014-02-27 22:20 ` [meta-qt5][PATCH dora v2 3/3] qtwebkit-examples: add RDEPENDS for ca-certificates Nicolas Dechesne
-- strict thread matches above, loose matches on Subject: below --
2014-02-27 22:15 [meta-qt5][PATCH dora v2 0/3] A couple of backport for dora Nicolas Dechesne
2014-02-27 22:15 ` [meta-qt5][PATCH dora v2 1/3] qtbase.inc: don't force ARM_INSTRUCTION_SET to arm Nicolas Dechesne
2014-02-27 22:15 ` [meta-qt5][PATCH dora v2 2/3] qtbase: configure with -openssl-linked instead of -openssl Nicolas Dechesne
2014-02-27 22:16 ` [meta-qt5][PATCH dora v2 3/3] qtwebkit-examples: add RDEPENDS for ca-certificates Nicolas Dechesne
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.