From 01a03a192c0321b9146a3f97cffbd53c13e71957 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 28 Nov 2019 18:02:46 +0800 Subject: [PATCH] qt5: fix dir --- package/lean/qt5/{qt5 => }/Makefile | 0 .../patches/010-pre_3.6_kernels_fix.patch | 0 .../patches/020-disable_unused_libs.patch | 0 package/lean/qt5/qt5/qt5/Makefile | 204 ------------------ .../qt5/patches/010-pre_3.6_kernels_fix.patch | 74 ------- .../qt5/patches/020-disable_unused_libs.patch | 91 -------- .../mkspecs/linux-openwrt-g++/qmake.conf | 31 --- .../mkspecs/linux-openwrt-g++/qplatformdefs.h | 9 - .../mkspecs/linux-openwrt-g++/qmake.conf | 0 .../mkspecs/linux-openwrt-g++/qplatformdefs.h | 0 10 files changed, 409 deletions(-) rename package/lean/qt5/{qt5 => }/Makefile (100%) rename package/lean/qt5/{qt5 => }/patches/010-pre_3.6_kernels_fix.patch (100%) rename package/lean/qt5/{qt5 => }/patches/020-disable_unused_libs.patch (100%) delete mode 100644 package/lean/qt5/qt5/qt5/Makefile delete mode 100644 package/lean/qt5/qt5/qt5/patches/010-pre_3.6_kernels_fix.patch delete mode 100644 package/lean/qt5/qt5/qt5/patches/020-disable_unused_libs.patch delete mode 100644 package/lean/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf delete mode 100644 package/lean/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h rename package/lean/qt5/{qt5/qt5 => }/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf (100%) rename package/lean/qt5/{qt5/qt5 => }/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h (100%) diff --git a/package/lean/qt5/qt5/Makefile b/package/lean/qt5/Makefile similarity index 100% rename from package/lean/qt5/qt5/Makefile rename to package/lean/qt5/Makefile diff --git a/package/lean/qt5/qt5/patches/010-pre_3.6_kernels_fix.patch b/package/lean/qt5/patches/010-pre_3.6_kernels_fix.patch similarity index 100% rename from package/lean/qt5/qt5/patches/010-pre_3.6_kernels_fix.patch rename to package/lean/qt5/patches/010-pre_3.6_kernels_fix.patch diff --git a/package/lean/qt5/qt5/patches/020-disable_unused_libs.patch b/package/lean/qt5/patches/020-disable_unused_libs.patch similarity index 100% rename from package/lean/qt5/qt5/patches/020-disable_unused_libs.patch rename to package/lean/qt5/patches/020-disable_unused_libs.patch diff --git a/package/lean/qt5/qt5/qt5/Makefile b/package/lean/qt5/qt5/qt5/Makefile deleted file mode 100644 index 89ffa4efa2..0000000000 --- a/package/lean/qt5/qt5/qt5/Makefile +++ /dev/null @@ -1,204 +0,0 @@ -# -# Copyright (C) 2017-2019 Entware -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# ported to Entware from -# https://github.com/KryptonLee/qBittorrent-openwrt-package and -# https://github.com/pawelkn/qt5-openwrt-package - -include $(TOPDIR)/rules.mk - -PKG_NAME:=qt5 -PKG_VERSION:=5.9.8 -PKG_RELEASE:=1 - -PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/5.9/$(PKG_VERSION)/single -PKG_HASH:=86aca7dc37f161fc730a9d4f6bddf684962ca560327682e282ff61bf8b859c36 - -PKG_BUILD_PARALLEL:=1 -PKG_USE_MIPS16:=0 - -PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - -ifndef CONFIG_USE_GLIBC -# not using sstrip here as this fucks up the .so's somehow -STRIP:=/bin/true -RSTRIP:= \ - NM="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)nm" \ - STRIP="$(STRIP)" \ - STRIP_KMOD="$(STRIP)" \ - $(SCRIPT_DIR)/rstrip.sh -endif - -define Package/qt5/Default - SECTION:=libs - CATEGORY:=Libraries - SUBMENU:=Qt5 - TITLE:=qt5 - URL:=http://qt-project.org - DEPENDS:=+librt +libstdcpp +libpthread @!LINUX_2_6_36 -endef - -define Package/qt5-core - $(call Package/qt5/Default) - TITLE+=core - DEPENDS+=+libatomic +zlib +libpcre2-16 +libdouble-conversion -endef - -define Package/qt5-network - $(call Package/qt5/Default) - TITLE+=network - DEPENDS+=+qt5-core +libopenssl -endef - -define Package/qt5-xml - $(call Package/qt5/Default) - TITLE+=xml - DEPENDS+=+qt5-core -endef - -CONFIGURE_ARGS = \ - -prefix /usr \ - -sysroot $(STAGING_DIR) \ - -plugindir /usr/lib/Qt/plugins \ - -R /usr/lib \ - -I $(STAGING_DIR)/usr/include \ - -L $(STAGING_DIR)/usr/lib \ - -xplatform linux-openwrt-g++ \ - -release \ - -shared \ - -opensource \ - -confirm-license \ - -no-use-gold-linker \ - -strip \ - -ltcg \ - -optimized-qmake \ - -system-doubleconversion \ - -no-glib \ - -no-icu \ - -system-pcre \ - -system-zlib \ - -no-slog2 \ - -openssl-runtime \ - -no-cups \ - -no-freetype \ - -no-harfbuzz \ - -no-gtk \ - -no-opengl \ - -no-opengles3 \ - -no-angle \ - -no-openvg \ - -no-directfb \ - -no-eglfs \ - -no-egl \ - -no-iconv \ - -no-gbm \ - -no-kms \ - -no-xcb \ - -no-pch \ - -no-libudev \ - -no-mtdev \ - -no-tslib \ - -no-xkbcommon-evdev \ - -no-libpng \ - -no-libjpeg \ - -no-sql-db2 \ - -no-sql-ibase \ - -no-sql-mysql \ - -no-sql-oci \ - -no-sql-odbc \ - -no-sql-psql \ - -no-sql-sqlite \ - -no-sql-sqlite2 \ - -no-sqlite \ - -no-sql-tds \ - -no-gui \ - -no-widgets \ - -no-dbus \ - -no-qml-debug \ - -make libs \ - -nomake examples \ - -nomake tests \ - -nomake tools \ - -no-compile-examples \ - -skip qt3d \ - -skip qtactiveqt \ - -skip qtandroidextras \ - -skip qtcanvas3d \ - -skip qtcharts \ - -skip qtconnectivity \ - -skip qtdatavis3d \ - -skip qtdeclarative \ - -skip qtdoc \ - -skip qtgamepad \ - -skip qtgraphicaleffects \ - -skip qtimageformats \ - -skip qtlocation \ - -skip qtmacextras \ - -skip qtmultimedia \ - -skip qtnetworkauth \ - -skip qtpurchasing \ - -skip qtquickcontrols \ - -skip qtquickcontrols2 \ - -skip qtremoteobjects \ - -skip qtscript \ - -skip qtscxml \ - -skip qtsensors \ - -skip qtserialbus \ - -skip qtserialport \ - -skip qtspeech \ - -skip qtsvg \ - -skip qttranslations \ - -skip qtvirtualkeyboard \ - -skip qtwayland \ - -skip qtwebchannel \ - -skip qtwebengine \ - -skip qtwebsockets \ - -skip qtwebview \ - -skip qtwinextras \ - -skip qtx11extras \ - -skip qtxmlpatterns \ - -v - -define Build/Configure - $(SED) 's@$$$$(TARGET_CROSS)@$(TARGET_CROSS)@g' $(PKG_BUILD_DIR)/qtbase/mkspecs/linux-openwrt-g++/qmake.conf - $(SED) 's@$$$$(TARGET_CFLAGS)@$(TARGET_CFLAGS)@g' $(PKG_BUILD_DIR)/qtbase/mkspecs/linux-openwrt-g++/qmake.conf - $(SED) 's@$$$$(TARGET_CXXFLAGS)@$(TARGET_CXXFLAGS)@g' $(PKG_BUILD_DIR)/qtbase/mkspecs/linux-openwrt-g++/qmake.conf - $(SED) 's@$$$$(TARGET_LDFLAGS)@$(TARGET_LDFLAGS)@g' $(PKG_BUILD_DIR)/qtbase/mkspecs/linux-openwrt-g++/qmake.conf - - $(call Build/Configure/Default) -endef - -define Build/Compile - $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) -endef - -define Build/InstallDev - $(MAKE) -C $(PKG_BUILD_DIR) install - $(INSTALL_CONF) $(PKG_BUILD_DIR)/qtbase/bin/qt.conf $(STAGING_DIR)/usr/bin - $(RM) $(STAGING_DIR)/usr/bin/qt{attributionsscanner,paths,plugininfo} -endef - -define Package/qt5-core/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Core.so* $(1)/usr/lib -endef - -define Package/qt5-network/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Network.so* $(1)/usr/lib -endef - -define Package/qt5-xml/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Xml.so* $(1)/usr/lib -endef - -$(eval $(call BuildPackage,qt5-core,+zlib,+libpcre2-16,+libdouble-conversion)) -$(eval $(call BuildPackage,qt5-network)) -$(eval $(call BuildPackage,qt5-xml)) diff --git a/package/lean/qt5/qt5/qt5/patches/010-pre_3.6_kernels_fix.patch b/package/lean/qt5/qt5/qt5/patches/010-pre_3.6_kernels_fix.patch deleted file mode 100644 index 818e4efcdd..0000000000 --- a/package/lean/qt5/qt5/qt5/patches/010-pre_3.6_kernels_fix.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp -+++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp -@@ -33,7 +33,6 @@ - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ -- - #include "socketcanbackend.h" - - #include -@@ -50,29 +49,7 @@ - #include - #include - --#ifndef CANFD_MTU --// CAN FD support was added by Linux kernel 3.6 --// For prior kernels we redefine the missing defines here --// they are taken from linux/can/raw.h & linux/can.h -- --enum { -- CAN_RAW_FD_FRAMES = 5 --}; -- --#define CAN_MAX_DLEN 8 --#define CANFD_MAX_DLEN 64 --struct canfd_frame { -- canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ -- __u8 len; /* frame payload length in byte */ -- __u8 flags; /* additional flags for CAN FD */ -- __u8 __res0; /* reserved / padding */ -- __u8 __res1; /* reserved / padding */ -- __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); --}; --#define CAN_MTU (sizeof(struct can_frame)) --#define CANFD_MTU (sizeof(struct canfd_frame)) - --#endif - - #ifndef CANFD_BRS - # define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ ---- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h -+++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h -@@ -45,6 +45,31 @@ - #include - #include - -+#ifndef CANFD_MTU -+// CAN FD support was added by Linux kernel 3.6 -+// For prior kernels we redefine the missing defines here -+// they are taken from linux/can/raw.h & linux/can.h -+ -+enum { -+ CAN_RAW_FD_FRAMES = 5 -+}; -+ -+#define CAN_MAX_DLEN 8 -+#define CANFD_MAX_DLEN 64 -+struct canfd_frame { -+ canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ -+ __u8 len; /* frame payload length in byte */ -+ __u8 flags; /* additional flags for CAN FD */ -+ __u8 __res0; /* reserved / padding */ -+ __u8 __res1; /* reserved / padding */ -+ __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); -+}; -+#define CAN_MTU (sizeof(struct can_frame)) -+#define CANFD_MTU (sizeof(struct canfd_frame)) -+ -+#endif -+ -+ - QT_BEGIN_NAMESPACE - - class SocketCanBackend : public QCanBusDevice diff --git a/package/lean/qt5/qt5/qt5/patches/020-disable_unused_libs.patch b/package/lean/qt5/qt5/qt5/patches/020-disable_unused_libs.patch deleted file mode 100644 index e32bae7647..0000000000 --- a/package/lean/qt5/qt5/qt5/patches/020-disable_unused_libs.patch +++ /dev/null @@ -1,91 +0,0 @@ -This patch disables prinstsupport, sql, concurrent, testlib base libs compilation ---- a/qtbase/src/src.pro -+++ b/qtbase/src/src.pro -@@ -66,22 +66,10 @@ src_dbus.target = sub-dbus - src_dbus.depends = src_corelib - force_dbus_bootstrap: src_dbus.depends += src_tools_bootstrap_dbus # avoid syncqt race - --src_concurrent.subdir = $$PWD/concurrent --src_concurrent.target = sub-concurrent --src_concurrent.depends = src_corelib -- --src_sql.subdir = $$PWD/sql --src_sql.target = sub-sql --src_sql.depends = src_corelib -- - src_network.subdir = $$PWD/network - src_network.target = sub-network - src_network.depends = src_corelib - --src_testlib.subdir = $$PWD/testlib --src_testlib.target = sub-testlib --src_testlib.depends = src_corelib # testlib links only to corelib, but see below for the headers -- - src_3rdparty_pcre2.subdir = $$PWD/3rdparty/pcre2 - src_3rdparty_pcre2.target = sub-3rdparty-pcre2 - -@@ -125,13 +113,6 @@ src_openglextensions.subdir = $$PWD/open - src_openglextensions.target = sub-openglextensions - src_openglextensions.depends = src_gui - --src_printsupport.subdir = $$PWD/printsupport --src_printsupport.target = sub-printsupport --src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic -- --src_plugins.subdir = $$PWD/plugins --src_plugins.target = sub-plugins -- - src_android.subdir = $$PWD/android - - # this order is important -@@ -152,14 +133,8 @@ TOOLS = src_tools_moc src_tools_rcc src_ - win32:SUBDIRS += src_winmain - qtConfig(network) { - SUBDIRS += src_network -- src_plugins.depends += src_network --} --qtConfig(sql) { -- SUBDIRS += src_sql -- src_plugins.depends += src_sql - } - qtConfig(xml): SUBDIRS += src_xml --qtConfig(testlib): SUBDIRS += src_testlib - qtConfig(dbus) { - force_dbus_bootstrap|qtConfig(private_tests): \ - SUBDIRS += src_tools_bootstrap_dbus -@@ -167,9 +142,7 @@ qtConfig(dbus) { - TOOLS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml - qtConfig(accessibility-atspi-bridge): \ - src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp -- src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml - } --qtConfig(concurrent): SUBDIRS += src_concurrent - qtConfig(gui) { - qtConfig(harfbuzz):!qtConfig(system-harfbuzz) { - SUBDIRS += src_3rdparty_harfbuzzng -@@ -190,24 +163,17 @@ qtConfig(gui) { - } - SUBDIRS += src_gui src_platformsupport src_platformheaders - qtConfig(opengl): SUBDIRS += src_openglextensions -- src_plugins.depends += src_gui src_platformsupport src_platformheaders -- src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers - qtConfig(widgets) { - SUBDIRS += src_tools_uic src_widgets - !android-embedded: SUBDIRS += src_printsupport - TOOLS += src_tools_uic -- src_plugins.depends += src_widgets -- !android-embedded: src_plugins.depends += src_printsupport -- src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers - qtConfig(opengl) { - SUBDIRS += src_opengl -- src_plugins.depends += src_opengl - } - } - } --SUBDIRS += src_plugins - --nacl: SUBDIRS -= src_network src_testlib -+nacl: SUBDIRS -= src_network - - android:!android-embedded: SUBDIRS += src_android src_3rdparty_gradle - diff --git a/package/lean/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf b/package/lean/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf deleted file mode 100644 index 8aec5b857f..0000000000 --- a/package/lean/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf +++ /dev/null @@ -1,31 +0,0 @@ -# -# qmake configuration for building with linux-openwrt-g++ -# - -MAKEFILE_GENERATOR = UNIX -CONFIG += incremental -QMAKE_INCREMENTAL_STYLE = sublib - -include(../common/linux.conf) -include(../common/gcc-base-unix.conf) -include(../common/g++-unix.conf) - -# modifications to g++.conf -QMAKE_CC = $(TARGET_CROSS)gcc -QMAKE_CXX = $(TARGET_CROSS)g++ - -QMAKE_CFLAGS += $(TARGET_CFLAGS) -QMAKE_CXXFLAGS += $(TARGET_CXXFLAGS) -QMAKE_LFLAGS += $(TARGET_LDFLAGS) - -QMAKE_LINK_C = $(TARGET_CROSS)gcc -QMAKE_LINK_C_SHLIB = $(TARGET_CROSS)gcc -QMAKE_LINK = $(TARGET_CROSS)g++ -QMAKE_LINK_SHLIB = $(TARGET_CROSS)g++ - -# modifications to linux.conf -QMAKE_AR = $(TARGET_CROSS)ar cqs -QMAKE_OBJCOPY = $(TARGET_CROSS)objcopy -QMAKE_NM = $(TARGET_CROSS)nm -P -QMAKE_STRIP = $(TARGET_CROSS)strip -load(qt_config) diff --git a/package/lean/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h b/package/lean/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h deleted file mode 100644 index 02e77c9a37..0000000000 --- a/package/lean/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h +++ /dev/null @@ -1,9 +0,0 @@ -#include "../linux-g++/qplatformdefs.h" - -#undef QT_SOCKLEN_T - -#if defined(__GLIBC__) && (__GLIBC__ < 2) -#define QT_SOCKLEN_T int -#else -#define QT_SOCKLEN_T socklen_t -#endif diff --git a/package/lean/qt5/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf b/package/lean/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf similarity index 100% rename from package/lean/qt5/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf rename to package/lean/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qmake.conf diff --git a/package/lean/qt5/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h b/package/lean/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h similarity index 100% rename from package/lean/qt5/qt5/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h rename to package/lean/qt5/src/qtbase/mkspecs/linux-openwrt-g++/qplatformdefs.h