Import buildroot 2016.02
This commit is contained in:
@@ -407,12 +407,13 @@ config BR2_PACKAGE_QT_NETWORK
|
||||
|
||||
config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
|
||||
bool
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
# see src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
|
||||
# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
|
||||
default y if BR2_arc || BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazeel || \
|
||||
BR2_microblazebe || BR2_mips || BR2_mipsel || \
|
||||
(BR2_mips64 || BR2_mips64el) && !BR2_MIPS_NABI32 || BR2_powerpc || \
|
||||
BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || BR2_x86_64
|
||||
BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64
|
||||
# The CodeSourcery SuperH toolchain fails to build Webkit,
|
||||
# with an assertion failure in binutils.
|
||||
default y if (BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb) && \
|
||||
@@ -454,12 +455,13 @@ config BR2_PACKAGE_QT_OPENSSL
|
||||
|
||||
config BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
|
||||
bool
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
|
||||
default y if BR2_arc || BR2_arm || BR2_armeb || aarch64 || BR2_i386 || \
|
||||
default y if BR2_arc || BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
|
||||
BR2_microblazeel || BR2_microblazebe || BR2_mips || BR2_mipsel || \
|
||||
BR2_mips64 || BR2_mips64el || BR2_nios2 || BR2_powerpc || \
|
||||
BR2_powerpc64 || BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \
|
||||
BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64
|
||||
BR2_sh4a || BR2_sh4aeb || BR2_x86_64
|
||||
|
||||
config BR2_PACKAGE_QT_SCRIPT
|
||||
bool "Script Module"
|
||||
|
||||
@@ -660,13 +660,30 @@ define QT_INSTALL_TARGET_FONTS
|
||||
mkdir -p $(TARGET_DIR)/usr/lib/fonts
|
||||
cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
|
||||
endef
|
||||
ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),)
|
||||
# as stated in the font source src/3rdparty/fonts/micro.bdf
|
||||
# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf
|
||||
QT_LICENSE += , Public Domain (Micro/Fixed font)
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),)
|
||||
QT_LICENSE += , Adobe Helvetica license (Helvetica/Japanese fonts)
|
||||
QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y)
|
||||
QT_LICENSE += , Freeware (Unifont font)
|
||||
QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
|
||||
endif
|
||||
endif # QT_FONTS
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
|
||||
define QT_INSTALL_TARGET_FONTS_TTF
|
||||
mkdir -p $(TARGET_DIR)/usr/lib/fonts
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
|
||||
endef
|
||||
QT_LICENSE += , Bitstream license (DejaVu/Vera TrueType fonts)
|
||||
QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \
|
||||
src/3rdparty/fonts/README.DejaVu \
|
||||
src/3rdparty/fonts/COPYRIGHT.Vera
|
||||
endif
|
||||
endif # BR2_PACKAGE_QT_EMBEDDED
|
||||
|
||||
|
||||
Reference in New Issue
Block a user