From: Peter Seiderer Date: Thu, 27 Jul 2017 19:24:31 +0000 (+0200) Subject: qt-webkit-kiosk: fix icu/qt5webkit dependecy propagation X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d9d2744f5b570326763b76ac957b37bd5ff0729;p=buildroot.git qt-webkit-kiosk: fix icu/qt5webkit dependecy propagation ICU depends on BR2_HOST_GCC_AT_LEAST_4_8 and BR2_TOOLCHAIN_GCC_AT_LEAST_4_8, these dependencies are propagated to qt5webkit but were not propagated to qt-webkit-kiosk. Fixes [1]: The WebKit build was disabled for the following reasons: * ICU is required. [...] cp -dpf .../host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libQt5WebKit*.so.* .../target/usr/lib cp: cannot stat `.../host/i686-buildroot-linux-uclibc/sysroot/usr/lib/libQt5WebKit*.so.*': No such file or directory [1] http://autobuild.buildroot.net/results/2f3/2f381967c82775ad911a246a9607034ef489c1ce Signed-off-by: Peter Seiderer [Arnout: - rewrap commit message - fix spelling mistakes in commit message - reformulate the dependency comments] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- diff --git a/package/qt-webkit-kiosk/Config.in b/package/qt-webkit-kiosk/Config.in index 703f128373..c613a8e6d8 100644 --- a/package/qt-webkit-kiosk/Config.in +++ b/package/qt-webkit-kiosk/Config.in @@ -3,7 +3,9 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK depends on BR2_PACKAGE_QT5 depends on !BR2_STATIC_LIBS # qt5webkit depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit - depends on !BR2_BINFMT_FLAT # qt5webkit + depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu/qt5webkit + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu/qt5webkit + depends on !BR2_BINFMT_FLAT # icu/qt5webkit depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_QT5BASE_GUI @@ -21,3 +23,10 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS Deploy browser sound files on target endif + +comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.8, host gcc >= 4.8" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \ + !BR2_HOST_GCC_AT_LEAST_4_8 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + depends on !BR2_BINFMT_FLAT + depends on !BR2_MIPS_SOFT_FLOAT