qtbase: configure with -openssl-linked instead of -openssl
PATCH v2 1/2 qtbase: configure with -openssl-linked instead of -openssl
Configure qtbase with -openssl-linked (instead of -openssl) to ensure that run-time dependencies on libcryto and libssl are detected.
--- recipes-qt/qt5/qtbase.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-qt/qt5/qtbase.inc +2 -1
@@ -112,7 +112,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"
Signature · 1 line
1.8.1.2
PATCH v2 2/2 qtwebkit-examples: add RDEPENDS for ca-certificates
If qtbase is configured with openssl support then the qtwebkit browser example apps require CA certificates.
--- recipes-qt/qt5/qt5.inc | 2 ++ recipes-qt/qt5/qtbase.inc | 2 +- recipes-qt/qt5/qtwebkit-examples.inc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
recipes-qt/qt5/qt5.inc +2 -0
@@ -7,6 +7,8 @@ inherit qmake5 ICU = "icu " ICU_powerpc = "pango" +PACKAGECONFIG_OPENSSL ?= "openssl" + QT_MODULE ?= "${BPN}" # we don't want conflicts with qt4
recipes-qt/qt5/qtbase.inc +1 -1
@@ -47,7 +47,7 @@ PACKAGECONFIG ??= " \ udev \ evdev \ widgets \ - openssl \ + ${PACKAGECONFIG_OPENSSL} \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ ${PACKAGECONFIG_X11} \
recipes-qt/qt5/qtwebkit-examples.inc +1 -0
@@ -10,3 +10,4 @@ SRC_URI += " \ DEPENDS += "qtwebkit" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" +RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
Signature · 1 line
1.8.1.2
Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
Quoted 2 lines · Andre McCurdy
If qtbase is configured with openssl support then the qtwebkit browser example apps require CA certificates.
looks ok now
Quoted 50 lines
Signed-off-by Andre McCurdy <[email protected]>---
recipes-qt/qt5/qt5.inc | 2 ++ recipes-qt/qt5/qtbase.inc | 2 +- recipes-qt/qt5/qtwebkit-examples.inc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)recipes-qt/qt5/qt5.inc +0
-0@@ -7,6 +7,8 @@ inherit qmake5ICU = "icu "
ICU_powerpc= "pango"recipes-qt/qt5/qt5.inc +2
-0+PACKAGECONFIG_OPENSSL ?= "openssl" +
QT_MODULE?= "${BPN}"# we don't want conflicts with qt4recipes-qt/qt5/qtbase.inc +1
-1@@ -47,7 +47,7 @@ PACKAGECONFIG ??= " \ udev \ evdev \ widgets \ - openssl \ + ${PACKAGECONFIG_OPENSSL} \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ ${PACKAGECONFIG_X11} \recipes-qt/qt5/qtwebkit-examples.inc +0
-0@@ -10,3 +10,4 @@ SRC_URI += " \DEPENDS += "qtwebkit"
RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
+RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"Signature · 6 lines
1.8.1.2 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
In reply to Andre McCurdyQuoted 41 lines · Andre McCurdy
If qtbase is configured with openssl support then the qtwebkit browser example apps require CA certificates.
Signed-off-by Andre McCurdy <[email protected]>--- recipes-qt/qt5/qt5.inc | 2 ++ recipes-qt/qt5/qtbase.inc | 2 +- recipes-qt/qt5/qtwebkit-examples.inc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)recipes-qt/qt5/qt5.inc +2
-0@@ -7,6 +7,8 @@ inherit qmake5 ICU = "icu " ICU_powerpc = "pango" +PACKAGECONFIG_OPENSSL ?= "openssl" + QT_MODULE ?= "${BPN}" # we don't want conflicts with qt4recipes-qt/qt5/qtbase.inc +1
-1@@ -47,7 +47,7 @@ PACKAGECONFIG ??= " \ udev \ evdev \ widgets \ - openssl \ + ${PACKAGECONFIG_OPENSSL} \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ ${PACKAGECONFIG_X11} \recipes-qt/qt5/qtwebkit-examples.inc +0
-0
recipes-qt/qt5/qtwebkit-examples.inc SRC_URI += " \ · line 13
Quoted 4 lines
recipes-qt/qt5/qtwebkit-examples.inc +1
-0@@ -10,3 +10,4 @@ SRC_URI += " \ DEPENDS += "qtwebkit" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" +RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
This should be checking PACKAGECONFIG variable (not PACKAGECONFIG_OPENSSL).
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
Quoted 43 lines · Martin Jansa
Quoted 42 lines · Andre McCurdy
If qtbase is configured with openssl support then the qtwebkit browser example apps require CA certificates.
Signed-off-by Andre McCurdy <[email protected]>--- recipes-qt/qt5/qt5.inc | 2 ++ recipes-qt/qt5/qtbase.inc | 2 +- recipes-qt/qt5/qtwebkit-examples.inc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)recipes-qt/qt5/qt5.inc +2
-0@@ -7,6 +7,8 @@ inherit qmake5 ICU = "icu " ICU_powerpc = "pango" +PACKAGECONFIG_OPENSSL ?= "openssl" + QT_MODULE ?= "${BPN}" # we don't want conflicts with qt4recipes-qt/qt5/qtbase.inc +1
-1@@ -47,7 +47,7 @@ PACKAGECONFIG ??= " \ udev \ evdev \ widgets \ - openssl \ + ${PACKAGECONFIG_OPENSSL} \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ ${PACKAGECONFIG_X11} \recipes-qt/qt5/qtwebkit-examples.inc +0
-0@@ -10,3 +10,4 @@ SRC_URI += " \
Quoted 6 lines
recipes-qt/qt5/qtwebkit-examples.inc SRC_URI += " \ · line 13
Quoted 3 lines
recipes-qt/qt5/qtwebkit-examples.inc +1
-0DEPENDS += "qtwebkit" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" +RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"This should be checking PACKAGECONFIG variable (not
PACKAGECONFIG_OPENSSL).
Please ignore my comment, I haven't noticed that you've added PACKAGECONFIG_OPENSSL to qt5.inc and it's actually "from qtbase's PACKAGECONFIG".
I've added comment in qtbase.inc and integrated this to master-next.
Thanks
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
Quoted 3 lines · Martin Jansa
I've added comment in qtbase.inc and integrated this to master-next.
Great! Thank-you Martin and Khem.
Andre
--
Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
In reply to Martin JansaQuoted 5 lines · Martin Jansa
Please ignore my comment, I haven't noticed that you've added
PACKAGECONFIG_OPENSSLto qt5.inc and it's actually "from qtbase's PACKAGECONFIG".I've added comment in qtbase.inc and integrated this to master-next.
hmm. still i don't get it. openssl can be added to PACKAGECONFIG without being added in PACKAGECONFIG_OPENSSL, right? so why don't we test is openssl is in PACKAGECONFIG?
Am I missing anything?
nico
Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
Quoted 5 lines · Nicolas Dechesne
Quoted 4 lines · Martin Jansa
Please ignore my comment, I haven't noticed that you've added
PACKAGECONFIG_OPENSSLto qt5.inc and it's actually "from qtbase's PACKAGECONFIG".
Quoted 7 lines
Quoted 1 line
I've added comment in qtbase.inc and integrated this to master-next.
hmm. still i don't get it. openssl can be added to PACKAGECONFIG without being added in
PACKAGECONFIG_OPENSSL, right? so why don't we test is openssl is in PACKAGECONFIG?Am I missing anything?
because qtwebkit-examples is checking PACKAGECONFIG from qtbase recipe
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-qt5][PATCH v2 2/2] qtwebkit-examples: add RDEPENDS for ca-certificates
Quoted 1 line · Martin Jansa
because qtwebkit-examples is checking PACKAGECONFIG from qtbase recipe
right... this is quite ugly, no? I understand what we are trying to do here. but do we really want to do it like this? is there a way we can read the qtbase PACKAGECONFIG value from within qtwebkit recipe? even if it's using some internals "sauce", that might be better than what's currently done, no?
nico