initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,53 @@
|
||||
From 22d7a9050b04b021e33430d0f7e3c5ee80c24caa Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Tue, 17 Dec 2019 11:01:59 +0100
|
||||
Subject: [PATCH] Disable designer tool (fixes configure error).
|
||||
|
||||
Fixes:
|
||||
|
||||
.../build/qt5tools-5.14.0/src/designer/src/components/lib/lib.pro
|
||||
Project ERROR: Multiple modules claim plugin type 'designer' (uitools, in addition to designer)
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
[Rebased for Qt5.15.0]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
[Rebased for Qt5.15.1]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
[Rebased for Qt5.15.2]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/linguist/linguist/linguist.pro | 2 +-
|
||||
src/src.pro | 5 +----
|
||||
2 files changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
|
||||
index d083896..7d74cfc 100644
|
||||
--- a/src/linguist/linguist/linguist.pro
|
||||
+++ b/src/linguist/linguist/linguist.pro
|
||||
@@ -1,4 +1,4 @@
|
||||
-QT += core-private gui-private widgets uitools-private printsupport
|
||||
+QT += core-private gui-private widgets printsupport
|
||||
|
||||
DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
|
||||
|
||||
diff --git a/src/src.pro b/src/src.pro
|
||||
index f2675c7..360de50 100644
|
||||
--- a/src/src.pro
|
||||
+++ b/src/src.pro
|
||||
@@ -6,12 +6,9 @@ qtHaveModule(widgets) {
|
||||
} else {
|
||||
QT_FOR_CONFIG += widgets
|
||||
qtConfig(pushbutton):qtConfig(toolbutton) {
|
||||
- SUBDIRS = designer \
|
||||
- pixeltool
|
||||
+ SUBDIRS = pixeltool
|
||||
|
||||
!static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
|
||||
-
|
||||
- linguist.depends = designer
|
||||
}
|
||||
qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
|
||||
}
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
config BR2_PACKAGE_QT5TOOLS
|
||||
bool "qt5tools"
|
||||
help
|
||||
Qt is a cross-platform application and UI framework for
|
||||
developers using C++.
|
||||
|
||||
Qt Tools provides tools facilitate the development
|
||||
and design of applications.
|
||||
|
||||
http://doc.qt.io/qt-5/qtmodules.html#qt-tools
|
||||
|
||||
if BR2_PACKAGE_QT5TOOLS
|
||||
|
||||
config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS
|
||||
bool "Linguist host tools (lconvert, lrelease, lupdate)"
|
||||
help
|
||||
This option enables the linguist host tools
|
||||
lconvert, lrelease and lupdate.
|
||||
|
||||
config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL
|
||||
bool "qdoc host tool"
|
||||
# Needs llvm-config and libclang for the host, which is not
|
||||
# currently supported in Buildroot, unless the target is
|
||||
# already supported by llvm.
|
||||
depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang
|
||||
depends on BR2_INSTALL_LIBSTDCPP # llvm, clang
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang
|
||||
depends on !BR2_STATIC_LIBS # llvm, clang
|
||||
depends on BR2_USE_WCHAR # llvm, clang
|
||||
help
|
||||
This option enables the qdoc host tool.
|
||||
|
||||
config BR2_PACKAGE_QT5TOOLS_PIXELTOOL
|
||||
bool "pixeltool"
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
select BR2_PACKAGE_QT5BASE_WIDGETS
|
||||
select BR2_PACKAGE_QT5BASE_PNG # saving png images
|
||||
help
|
||||
Compile and install the pixeltool program.
|
||||
|
||||
config BR2_PACKAGE_QT5TOOLS_QTDIAG
|
||||
bool "qtdiag"
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
help
|
||||
Compile and install the qtdiag program.
|
||||
|
||||
config BR2_PACKAGE_QT5TOOLS_QTPATHS
|
||||
bool "qtpaths"
|
||||
help
|
||||
Compile and install the qtpaths program.
|
||||
|
||||
config BR2_PACKAGE_QT5TOOLS_QTPLUGININFO
|
||||
bool "qtplugininfo"
|
||||
help
|
||||
Compile and install the qtplugininfo program.
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,9 @@
|
||||
# Hash from: https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qttools-everywhere-src-5.15.2.tar.xz.sha256
|
||||
sha256 c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc qttools-everywhere-src-5.15.2.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
|
||||
sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
|
||||
sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
|
||||
@@ -0,0 +1,64 @@
|
||||
################################################################################
|
||||
#
|
||||
# qt5tools
|
||||
#
|
||||
################################################################################
|
||||
|
||||
QT5TOOLS_VERSION = $(QT5_VERSION)
|
||||
QT5TOOLS_SITE = $(QT5_SITE)
|
||||
QT5TOOLS_SOURCE = qttools-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5TOOLS_VERSION).tar.xz
|
||||
|
||||
QT5TOOLS_INSTALL_STAGING = YES
|
||||
|
||||
# linguist tools compile conditionally on qtHaveModule(qmldevtools-private),
|
||||
# but the condition is used only used to decide if lupdate will support
|
||||
# parsing qml files (via setting QT_NO_QML define), no linking against
|
||||
# target qt5 will happen
|
||||
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
|
||||
QT5TOOLS_DEPENDENCIES += qt5declarative
|
||||
endif
|
||||
|
||||
QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
|
||||
QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
|
||||
|
||||
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
|
||||
linguist/lconvert linguist/lrelease linguist/lupdate
|
||||
QT5TOOLS_INSTALL_STAGING_DIR_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
|
||||
linguist
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5TOOLS_QDOC_TOOL),y)
|
||||
QT5TOOLS_BUILD_DIRS_y += qdoc
|
||||
QT5TOOLS_INSTALL_STAGING_DIR_y += qdoc
|
||||
QT5TOOLS_DEPENDENCIES += host-clang
|
||||
endif
|
||||
|
||||
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool
|
||||
|
||||
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag
|
||||
|
||||
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths
|
||||
|
||||
QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
|
||||
QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
|
||||
|
||||
define QT5TOOLS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all
|
||||
$(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p)$(sep))
|
||||
endef
|
||||
|
||||
# use install target to copy cmake module files
|
||||
define QT5TOOLS_INSTALL_STAGING_CMDS
|
||||
$(foreach p,$(QT5TOOLS_INSTALL_STAGING_DIR_y), \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p) install$(sep))
|
||||
endef
|
||||
|
||||
define QT5TOOLS_INSTALL_TARGET_CMDS
|
||||
$(foreach p,$(QT5TOOLS_INSTALL_TARGET_y), \
|
||||
$(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep))
|
||||
endef
|
||||
|
||||
$(eval $(qmake-package))
|
||||
Reference in New Issue
Block a user