qt5*: outsource common PKG_*-vars into common.mk

given qt5/common.mk is now included earlier, some variables such as
CONFIGURE_PREFIX are not yet defined. Since it's always /usr anyway,
set it statically.

diff --git a/frameworks/qt5/common.mk b/frameworks/qt5/common.mk
index 239062fc1ccf55a717f915d9eac1945c88a5b768..0a7d7945fe13dae5eddc750d37762ff7de45ecff 100644 (file)
--- a/frameworks/qt5/common.mk
+++ b/frameworks/qt5/common.mk
@@ -5,10 +5,8 @@
 # See /LICENSE for more information.
 #
 
-QT_VERSION:=5.15.16
-
 # for target builds (STAGING_DIR)
-QT_INSTALL_PREFIX:=$(CONFIGURE_PREFIX)
+QT_INSTALL_PREFIX:=/usr
 QT_INSTALL_CONFIGURATION:=/etc/qt5
 QT_INSTALL_LIBS:=$(QT_INSTALL_PREFIX)/lib
 QT_INSTALL_DATA:=$(QT_INSTALL_PREFIX)/share/qt5
@@ -51,6 +49,25 @@ QT_HOSTPKG_QML:=$(QT_HOSTPKG_ARCHDATA)/qml
 QT_HOSTPKG_EXAMPLES:=$(QT_HOSTPKG_ARCHDATA)/examples
 QT_HOSTPKG_DEMOS:=$(QT_HOSTPKG_EXAMPLES)
 
+# PKG defaults
+
+PKG_VERSION?=5.15.16
+
+PKG_SOURCE_URL?=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
+PKG_SYS_NAME?=$(subst $(firstword $(subst ., ,$(PKG_VERSION))),,$(PKG_NAME))
+PKG_SYS_NAME_FULL?=$(PKG_SYS_NAME)-everywhere-src-$(PKG_VERSION)
+PKG_SOURCE?=$(subst -src-,-opensource-src-,$(PKG_SYS_NAME_FULL)).tar.xz
+
+PKG_LICENSE?=LGPL-3.0-or-commercial
+
+PKG_BUILD_DIR?=$(BUILD_DIR)/$(PKG_SYS_NAME_FULL)
+HOST_BUILD_DIR?=$(BUILD_DIR)/host/$(PKG_SYS_NAME_FULL)
+
+PKG_BUILD_PARALLEL?=1
+HOST_BUILD_PARALLEL?=1
+PKG_BUILD_FLAGS?=no-mips16
+
+PKG_INSTALL?=1
 
 define Build/Install/HostFiles
        $(INSTALL_DIR) \

diff --git a/frameworks/qt5/qt5base/Makefile b/frameworks/qt5/qt5base/Makefile
index b170e80b28e7c1f584ee500af6713be0fe749b0e..9992f17ffe94dc9cf465142c67d987605c466006 100644 (file)
--- a/frameworks/qt5/qt5base/Makefile
+++ b/frameworks/qt5/qt5base/Makefile
@@ -10,23 +10,17 @@
 # - no X11/wayland/xcb/kms support so far - primary target is linuxfb
 
 include $(TOPDIR)/rules.mk
-include ../common.mk
 
 PKG_NAME:=qt5base
-PKG_VERSION:=$(QT_VERSION)
 PKG_RELEASE:=1
 PKG_HASH:=b04815058c18058b6ba837206756a2c87d1391f07a0dcb0dd314f970fd041592
 
-PKG_SYS_NAME:=qtbase-everywhere-src-$(PKG_VERSION)
-PKG_SOURCE:=$(subst -src-,-opensource-src-,$(PKG_SYS_NAME)).tar.xz
-PKG_SOURCE_URL:=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
+include ../common.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../qmake.mk
 
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
-HOST_BUILD_DIR=$(BUILD_DIR)/host/$(PKG_SYS_NAME)
-PKG_BUILD_PARALLEL:=1
-HOST_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_BUILD_FLAGS:=no-mips16
 # Yes, the host build depends on the target build. This is not a mistake!
 # The target build provides the (target specific) qmake.mk file which
 # is also used for host builds.
@@ -38,11 +32,6 @@ PKG_BUILD_FLAGS:=no-mips16
 # makes use of the host build.
 HOST_BUILD_DEPENDS:=qt5base
 
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../qmake.mk
-
 # hard disable udev support for now
 CONFIG_PACKAGE_qt5base-input-autodiscovery:=
 

diff --git a/frameworks/qt5/qt5graphicaleffects/Makefile b/frameworks/qt5/qt5graphicaleffects/Makefile
index c93e6b02aab3d0b2c19e99b22d0c3edf39f9834b..caf498cbe1c96e52b7faf7d3c47248adfc7ac91f 100644 (file)
--- a/frameworks/qt5/qt5graphicaleffects/Makefile
+++ b/frameworks/qt5/qt5graphicaleffects/Makefile
@@ -6,22 +6,12 @@
 #
 
 include $(TOPDIR)/rules.mk
-include ../common.mk
 
 PKG_NAME:=qt5graphicaleffects
-PKG_VERSION=$(QT_VERSION)
 PKG_RELEASE:=1
 PKG_HASH:=d185813737f38352d81b3a405a9243aca1af7bfebe37aba22a4099a7031f640a
 
-PKG_SYS_NAME:=qtgraphicaleffects-everywhere-src-$(PKG_VERSION)
-PKG_SOURCE:=$(subst -src-,-opensource-src-,$(PKG_SYS_NAME)).tar.xz
-PKG_SOURCE_URL:=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=qt5base
-PKG_INSTALL:=1
-
+include ../common.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include ../qmake.mk

diff --git a/frameworks/qt5/qt5quick2-controls2/Makefile b/frameworks/qt5/qt5quick2-controls2/Makefile
index 3351a305b9d1b84fb3b3b1a6b28ee9a138395fd6..41001be57d09ab7148344e46508c2882d53e4189 100644 (file)
--- a/frameworks/qt5/qt5quick2-controls2/Makefile
+++ b/frameworks/qt5/qt5quick2-controls2/Makefile
@@ -6,21 +6,12 @@
 #
 
 include $(TOPDIR)/rules.mk
-include ../common.mk
 
 PKG_NAME:=qt5quick2-controls2
-PKG_VERSION=$(QT_VERSION)
 PKG_RELEASE:=1
 PKG_HASH:=6bdc134c7f86dcf0e416d89d96d0d1d1415ea465bceb1f360fb5badf2adcaa16
 
-PKG_SYS_NAME:=qtquickcontrols2-everywhere-src-$(PKG_VERSION)
-PKG_SOURCE:=$(subst -src-,-opensource-src-,$(PKG_SYS_NAME)).tar.xz
-PKG_SOURCE_URL:=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
+include ../common.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include ../qmake.mk

diff --git a/frameworks/qt5/qt5quick2/Makefile b/frameworks/qt5/qt5quick2/Makefile
index 914dcffb0061a8fe0693662ae56bb67f70b86bc1..d18c49243e4223c80c91e21378060a44ca9df747 100644 (file)
--- a/frameworks/qt5/qt5quick2/Makefile
+++ b/frameworks/qt5/qt5quick2/Makefile
@@ -6,22 +6,13 @@
 #
 
 include $(TOPDIR)/rules.mk
-include ../common.mk
 
 PKG_NAME:=qt5quick2
-PKG_VERSION=$(QT_VERSION)
 PKG_RELEASE:=1
 PKG_HASH:=4e05de0747176a8a86a8c098ad215c2cdf1825a572b62a70b2e91cd81357408d
+PKG_SYS_NAME:=qtdeclarative
 
-PKG_SYS_NAME:=qtdeclarative-everywhere-src-$(PKG_VERSION)
-PKG_SOURCE:=$(subst -src-,-opensource-src-,$(PKG_SYS_NAME)).tar.xz
-PKG_SOURCE_URL:=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=qt5base
-PKG_INSTALL:=1
-
+include ../common.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include ../qmake.mk

diff --git a/frameworks/qt5/qt5script/Makefile b/frameworks/qt5/qt5script/Makefile
index 7d7bfd26585455668edfc2f3b13ba14203b816aa..d665c5556ef9b799b16ec77bc71acbd3fff0fd09 100644 (file)
--- a/frameworks/qt5/qt5script/Makefile
+++ b/frameworks/qt5/qt5script/Makefile
@@ -6,22 +6,12 @@
 #
 
 include $(TOPDIR)/rules.mk
-include ../common.mk
 
 PKG_NAME:=qt5script
-PKG_VERSION=$(QT_VERSION)
 PKG_RELEASE:=1
 PKG_HASH:=0b98baa6eece7d0e7860590dd67faf452499096f62f33d16556fd38ac236eec2
 
-PKG_SYS_NAME:=qtscript-everywhere-src-$(PKG_VERSION)
-PKG_SOURCE:=$(subst -src-,-opensource-src-,$(PKG_SYS_NAME)).tar.xz
-PKG_SOURCE_URL:=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
-PKG_BUILD_PARALLEL:=1
-PKG_BUILD_DEPENDS:=qt5base
-PKG_INSTALL:=1
-
+include ../common.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include ../qmake.mk

diff --git a/frameworks/qt5/qt5tools/Makefile b/frameworks/qt5/qt5tools/Makefile
index f65129f09d0e49472df8955d9b793e66d3d07c7f..ec02f5b7f8ac64d979c5fed5618add51ce7077b7 100644 (file)
--- a/frameworks/qt5/qt5tools/Makefile
+++ b/frameworks/qt5/qt5tools/Makefile
@@ -6,30 +6,19 @@
 #
 
 include $(TOPDIR)/rules.mk
-include ../common.mk
 
 PKG_NAME:=qt5tools
-PKG_VERSION=$(QT_VERSION)
 PKG_RELEASE:=1
 PKG_HASH:=1cab11887faca54af59f4995ee435c9ad98d194e9e6889c846692c8b6815fc1c
 
-PKG_SYS_NAME:=qttools-everywhere-src-$(PKG_VERSION)
-PKG_SOURCE:=$(subst -src-,-opensource-src-,$(PKG_SYS_NAME)).tar.xz
-PKG_SOURCE_URL:=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
-
-PKG_HOST_ONLY:=1
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
-HOST_BUILD_DIR=$(BUILD_DIR)/host/$(PKG_SYS_NAME)
-PKG_BUILD_PARALLEL:=1
-HOST_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-HOST_BUILD_DEPENDS:=qt5base/host
-
+include ../common.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/nls.mk
 include ../qmake.mk
 
+HOST_BUILD_DEPENDS:=qt5base/host
+
 define Package/qt5tools
   SECTION:=video-frameworks
   CATEGORY:=Video

diff --git a/frameworks/qt5/qt5translations/Makefile b/frameworks/qt5/qt5translations/Makefile
index e9f11e43eec08a29e3274fea1ea7108245eb43fd..cbda84b5d5aa782028d3aef231a0c86e502cf713 100644 (file)
--- a/frameworks/qt5/qt5translations/Makefile
+++ b/frameworks/qt5/qt5translations/Makefile
@@ -6,26 +6,18 @@
 #
 
 include $(TOPDIR)/rules.mk
-include ../common.mk
 
 PKG_NAME:=qt5translations
-PKG_VERSION=$(QT_VERSION)
 PKG_RELEASE:=1
 PKG_HASH:=415dbbb82a75dfc9a7be969e743bee54c0e6867be37bce4cf8f03da39f20112a
 
-PKG_SYS_NAME:=qttranslations-everywhere-src-$(PKG_VERSION)
-PKG_SOURCE:=$(subst -src-,-opensource-src-,$(PKG_SYS_NAME)).tar.xz
-PKG_SOURCE_URL:=https://download.qt.io/official_releases/qt/$(basename $(PKG_VERSION))/$(PKG_VERSION)/submodules
-
-PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_SYS_NAME)
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-PKG_BUILD_DEPENDS:=qt5tools/host
-
+include ../common.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include ../qmake.mk
 
+PKG_BUILD_DEPENDS:=qt5tools/host
+
 define Package/qt5translations
   SECTION:=video-frameworks
   CATEGORY:=Video