diff mbox series

[v2,7/7] package/qt5/qt5webengine: re-enable building if BUG_85682=y on Qt5 Latest

Message ID 20190626125900.48230-8-giulio.benetti@micronovasrl.com
State Accepted
Headers show
Series Microblaze clean up | expand

Commit Message

Giulio Benetti June 26, 2019, 12:59 p.m. UTC
On Qt5 Latest package qt5webengine depends on package libnss that was
affected by Gcc Bug 85862, but that bug has been worked around on
libnss, so we can now remove 'depends on
!BR2_TOOLCHAIN_HAS_GCC_BUG_85862' as well as '||
BR2_PACKAGE_QT5_VERSION_5_6' that allowed to build qt5 version 5.6 that
doesn't depend on libnss.

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
---
 package/qt5/qt5webengine/Config.in | 6 ------
 1 file changed, 6 deletions(-)

Comments

Thomas Petazzoni Aug. 3, 2019, 1:35 p.m. UTC | #1
On Wed, 26 Jun 2019 14:59:00 +0200
Giulio Benetti <giulio.benetti@micronovasrl.com> wrote:

> On Qt5 Latest package qt5webengine depends on package libnss that was
> affected by Gcc Bug 85862, but that bug has been worked around on
> libnss, so we can now remove 'depends on
> !BR2_TOOLCHAIN_HAS_GCC_BUG_85862' as well as '||
> BR2_PACKAGE_QT5_VERSION_5_6' that allowed to build qt5 version 5.6 that
> doesn't depend on libnss.
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
> ---
>  package/qt5/qt5webengine/Config.in | 6 ------
>  1 file changed, 6 deletions(-)

Applied to master after reworking a bit the commit title and commit log.

Thanks,

Thomas
diff mbox series

Patch

diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
index 744d659567..969582712e 100644
--- a/package/qt5/qt5webengine/Config.in
+++ b/package/qt5/qt5webengine/Config.in
@@ -20,18 +20,12 @@  comment "qt5webengine needs an OpenGL and EGL-capable backend"
 	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_PACKAGE_HAS_LIBEGL
 
-comment "qt5webengine needs a toolchain not affected by GCC bug 85862"
-	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
-	depends on !BR2_PACKAGE_QT5_VERSION_5_6
-	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_85862 # libnss
-
 config BR2_PACKAGE_QT5WEBENGINE
 	bool "qt5webengine"
 	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo
 	depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu
-	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs