From: Peter Korsgaard Date: Mon, 1 Dec 2014 10:15:54 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb;p=buildroot.git Merge branch 'next' Conflicts: Makefile package/flac/0001-fix-altivec-logic.patch package/grantlee/Config.in Signed-off-by: Peter Korsgaard --- fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb diff --cc package/grantlee/Config.in index 365209abf4,8f763f7ef0..900c39e143 --- a/package/grantlee/Config.in +++ b/package/grantlee/Config.in @@@ -1,16 -1,13 +1,17 @@@ config BR2_PACKAGE_GRANTLEE bool "grantlee" + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT - depends on BR2_PACKAGE_QT - select BR2_PACKAGE_QT_STL - select BR2_PACKAGE_QT_SCRIPT - select BR2_PACKAGE_QT_GUI_MODULE + depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT && BR2_PACKAGE_QT) || BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT + select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT + select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5SCRIPT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 help - Qt implemantation of the Django template framework + Qt implementation of the Django template framework http://www.grantlee.org +comment "grantlee needs a toolchain with NPTL" + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT ++ depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT || BR2_PACKAGE_QT5