Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
@@ -34,6 +34,14 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-optimize-debug
|
||||
endif
|
||||
|
||||
QT5BASE_CFLAGS = $(TARGET_CFLAGS)
|
||||
QT5BASE_CXXFLAGS = $(TARGET_CXXFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_90620),y)
|
||||
QT5BASE_CFLAGS += -O0
|
||||
QT5BASE_CXXFLAGS += -O0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5BASE_DEPENDENCIES += pcre
|
||||
else
|
||||
@@ -70,6 +78,12 @@ endif
|
||||
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -gbm
|
||||
QT5BASE_DEPENDENCIES += mesa3d
|
||||
else ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -gbm
|
||||
QT5BASE_DEPENDENCIES += gcnano-binaries
|
||||
else ifeq ($(BR2_PACKAGE_TI_SGX_LIBGBM),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -gbm
|
||||
QT5BASE_DEPENDENCIES += ti-sgx-libgbm
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-gbm
|
||||
endif
|
||||
@@ -93,7 +107,7 @@ 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-3-Clause (examples)
|
||||
QT5BASE_LICENSE += , BSD-3-Clause (examples)
|
||||
QT5BASE_LICENSE_FILES += header.BSD
|
||||
endif
|
||||
|
||||
@@ -145,7 +159,7 @@ QT5BASE_DEPENDENCIES += harfbuzz
|
||||
else
|
||||
# qt harfbuzz otherwise (using QAtomic instead)
|
||||
QT5BASE_CONFIGURE_OPTS += -qt-harfbuzz
|
||||
QT5BASE_LICENSE := $(QT5BASE_LICENSE), MIT (harfbuzz)
|
||||
QT5BASE_LICENSE += , MIT (harfbuzz)
|
||||
QT5BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING
|
||||
endif
|
||||
else
|
||||
@@ -160,7 +174,13 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
|
||||
QT5BASE_CONFIGURE_OPTS += -xcb
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -system-xkbcommon-x11
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -xkbcommon
|
||||
endif
|
||||
|
||||
QT5BASE_DEPENDENCIES += \
|
||||
libxcb \
|
||||
xcb-util-wm \
|
||||
@@ -254,6 +274,13 @@ QT5BASE_CONFIGURE_OPTS += -no-gtk
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -journald
|
||||
QT5BASE_DEPENDENCIES += systemd
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-journald
|
||||
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
|
||||
@@ -268,6 +295,9 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegrat
|
||||
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
|
||||
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_GCNANO_BINARIES),y)
|
||||
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFsKmsSupport
|
||||
endif
|
||||
else
|
||||
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration
|
||||
endif
|
||||
@@ -282,7 +312,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y)
|
||||
# use vivante backend
|
||||
QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv
|
||||
else ifeq ($(BR2_PACKAGE_SUNXI_MALI)$(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y)
|
||||
else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y)
|
||||
# use mali backend
|
||||
QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali
|
||||
endif
|
||||
@@ -338,8 +368,8 @@ define QT5BASE_CONFIGURE_CMDS
|
||||
-nomake tests \
|
||||
-device buildroot \
|
||||
-device-option CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
-device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
-device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS)" \
|
||||
-device-option BR_COMPILER_CFLAGS="$(QT5BASE_CFLAGS)" \
|
||||
-device-option BR_COMPILER_CXXFLAGS="$(QT5BASE_CXXFLAGS)" \
|
||||
$(QT5BASE_CONFIGURE_OPTS) \
|
||||
)
|
||||
endef
|
||||
@@ -357,7 +387,6 @@ endef
|
||||
|
||||
define QT5BASE_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
$(QT5_LA_PRL_FILES_FIXUP)
|
||||
$(QT5BASE_INSTALL_QT_CONF)
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user