Bump buidlroot version to 2018.02.6
This commit is contained in:
jbnadal
@@ -8,7 +8,7 @@ QT5BASE_VERSION = $(QT5_VERSION)
|
||||
QT5BASE_SITE = $(QT5_SITE)
|
||||
QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz
|
||||
|
||||
QT5BASE_DEPENDENCIES = host-pkgconf zlib pcre
|
||||
QT5BASE_DEPENDENCIES = host-pkgconf zlib
|
||||
QT5BASE_INSTALL_STAGING = YES
|
||||
|
||||
# A few comments:
|
||||
@@ -27,6 +27,12 @@ QT5BASE_CONFIGURE_OPTS += \
|
||||
-no-pch \
|
||||
-shared
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5BASE_DEPENDENCIES += pcre
|
||||
else
|
||||
QT5BASE_DEPENDENCIES += pcre2
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
|
||||
|
||||
# Uses libgbm from mesa3d
|
||||
@@ -47,23 +53,18 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -largefile
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
|
||||
QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
|
||||
QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
|
||||
else
|
||||
QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
|
||||
QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
|
||||
QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
|
||||
QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3c (examples)
|
||||
QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3-Clause (examples)
|
||||
QT5BASE_LICENSE_FILES += header.BSD
|
||||
endif
|
||||
else
|
||||
QT5BASE_LICENSE = Commercial license
|
||||
QT5BASE_REDISTRIBUTE = NO
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT5BASE_CONFIG_FILE))
|
||||
|
||||
@@ -104,6 +105,22 @@ QT5BASE_DEPENDENCIES += freetype
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_HARFBUZZ),y)
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y)
|
||||
# system harfbuzz in case __sync for 4 bytes is supported
|
||||
QT5BASE_CONFIGURE_OPTS += -system-harfbuzz
|
||||
QT5BASE_DEPENDENCIES += harfbuzz
|
||||
else
|
||||
# qt harfbuzz otherwise (using QAtomic instead)
|
||||
QT5BASE_CONFIGURE_OPTS += -qt-harfbuzz
|
||||
QT5BASE_LICENSE := $(QT5BASE_LICENSE), MIT (harfbuzz)
|
||||
QT5BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING
|
||||
endif
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-harfbuzz
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
|
||||
# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
|
||||
# is to add a link against the "inuxfb" library.
|
||||
@@ -189,6 +206,16 @@ else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-libinput
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
# only enable gtk support if libgtk3 X11 backend is enabled
|
||||
ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy)
|
||||
QT5BASE_CONFIGURE_OPTS += -gtk
|
||||
QT5BASE_DEPENDENCIES += libgtk3
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-gtk
|
||||
endif
|
||||
endif
|
||||
|
||||
# Build the list of libraries to be installed on the target
|
||||
QT5BASE_INSTALL_LIBS_y += Qt5Core
|
||||
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa
|
||||
@@ -213,6 +240,11 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
|
||||
|
||||
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy)
|
||||
# use vivante backend
|
||||
QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv
|
||||
endif
|
||||
|
||||
ifneq ($(QT5BASE_CONFIG_FILE),)
|
||||
define QT5BASE_CONFIGURE_CONFIG_FILE
|
||||
cp $(QT5BASE_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h
|
||||
@@ -228,7 +260,9 @@ endef
|
||||
endif
|
||||
|
||||
define QT5BASE_CONFIGURE_CMDS
|
||||
$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \
|
||||
mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/
|
||||
sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \
|
||||
$(QT5BASE_PKGDIR)/qmake.conf.in > \
|
||||
$(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf
|
||||
$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \
|
||||
$(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
|
||||
@@ -244,7 +278,7 @@ define QT5BASE_CONFIGURE_CMDS
|
||||
./configure \
|
||||
-v \
|
||||
-prefix /usr \
|
||||
-hostprefix $(HOST_DIR)/usr \
|
||||
-hostprefix $(HOST_DIR) \
|
||||
-headerdir /usr/include/qt5 \
|
||||
-sysroot $(STAGING_DIR) \
|
||||
-plugindir /usr/lib/qt/plugins \
|
||||
@@ -263,9 +297,17 @@ define QT5BASE_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
# The file "qt.conf" can be used to override the hard-coded paths that are
|
||||
# compiled into the Qt library. We need it to make "qmake" relocatable.
|
||||
define QT5BASE_INSTALL_QT_CONF
|
||||
sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \
|
||||
$(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf
|
||||
endef
|
||||
|
||||
define QT5BASE_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
$(QT5_LA_PRL_FILES_FIXUP)
|
||||
$(QT5BASE_INSTALL_QT_CONF)
|
||||
endef
|
||||
|
||||
define QT5BASE_INSTALL_TARGET_LIBS
|
||||
|
||||
Reference in New Issue
Block a user