Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -10,32 +10,24 @@ QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).t
|
||||
QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
|
||||
QT5DECLARATIVE_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
QT5DECLARATIVE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
|
||||
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
|
||||
QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
|
||||
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
|
||||
else
|
||||
QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
|
||||
QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
|
||||
QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
|
||||
endif
|
||||
else
|
||||
QT5DECLARATIVE_LICENSE = Commercial license
|
||||
QT5DECLARATIVE_REDISTRIBUTE = NO
|
||||
endif
|
||||
|
||||
define QT5DECLARATIVE_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
|
||||
endef
|
||||
|
||||
define QT5DECLARATIVE_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
sub-src-all sub-tools-all
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define QT5DECLARATIVE_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
|
||||
sub-src-install_subtargets \
|
||||
sub-tools-install_subtargets
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
|
||||
$(QT5_LA_PRL_FILES_FIXUP)
|
||||
endef
|
||||
|
||||
@@ -45,6 +37,9 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
|
||||
endef
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quick/ $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_LIBS
|
||||
@@ -55,9 +50,17 @@ endef
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qml* $(TARGET_DIR)/usr/lib/qt/examples/
|
||||
$(QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES)
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5DECLARATIVE_INSTALL_TARGET_CMDS
|
||||
cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin
|
||||
cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr
|
||||
$(QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES)
|
||||
$(QT5DECLARATIVE_INSTALL_TARGET_LIBS)
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user