- add generic package infrastructure

make/environment-build.mk

@@ -171,49 +171,6 @@ include package/pkg-configuration.mk
 
 # -----------------------------------------------------------------------------
 
-#HOST_MAKE_ENV = \
-#	$($(PKG)_MAKE_ENV)
-
-HOST_MAKE_OPTS = \
-	CC="$(HOSTCC)" \
-	GCC="$(HOSTCC)" \
-	CPP="$(HOSTCPP)" \
-	CXX="$(HOSTCXX)" \
-	LD="$(HOSTLD)" \
-	AR="$(HOSTAR)" \
-	AS="$(HOSTAS)" \
-	NM="$(HOSTNM)" \
-	OBJCOPY="$(HOSTOBJCOPY)" \
-	RANLIB="$(HOSTRANLIB)"
-
-#HOST_MAKE_OPTS += \
-#	$($(PKG)_MAKE_OPTS)
-
-#TARGET_MAKE_ENV = \
-#	$($(PKG)_MAKE_ENV)
-
-TARGET_MAKE_OPTS = \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	CC="$(TARGET_CC)" \
-	GCC="$(TARGET_CC)" \
-	CPP="$(TARGET_CPP)" \
-	CXX="$(TARGET_CXX)" \
-	LD="$(TARGET_LD)" \
-	AR="$(TARGET_AR)" \
-	AS="$(TARGET_AS)" \
-	NM="$(TARGET_NM)" \
-	OBJCOPY="$(TARGET_OBJCOPY)" \
-	OBJDUMP="$(TARGET_OBJDUMP)" \
-	RANLIB="$(TARGET_RANLIB)" \
-	READELF="$(TARGET_READELF)" \
-	STRIP="$(TARGET_STRIP)" \
-	ARCH=$(TARGET_ARCH)
-
-#TARGET_MAKE_OPTS += \
-#	$($(PKG)_MAKE_OPTS)
-
-# -----------------------------------------------------------------------------
-
 GITHUB			= https://github.com
 GITHUB_SSH		= git@github.com
 BITBUCKET		= https://bitbucket.org

package/Makefile.in

@@ -27,6 +27,7 @@ MAKEFLAGS += --no-print-directory
 
 include package/pkg-autotools.mk
 include package/pkg-cmake.mk
+include package/pkg-generic.mk
 include package/pkg-individual.mk
 include package/pkg-kernel-module.mk
 include package/pkg-meson.mk

package/pkg-autotools.mk

@@ -68,9 +68,8 @@ endef
 define autotools-package
 	$(call PREPARE)
 	$(call TARGET_CONFIGURE)
-	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+	$(call TARGET_MAKE)
-		$(MAKE); \
+	$(call TARGET_MAKE_INSTALL)
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(call TARGET_FOLLOWUP)
 endef
 
@@ -115,8 +114,7 @@ endef
 define host-autotools-package
 	$(call PREPARE)
 	$(call HOST_CONFIGURE)
-	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+	$(call HOST_MAKE)
-		$(MAKE); \
+	$(call HOST_MAKE_INSTALL)
-		$(MAKE) install
 	$(call HOST_FOLLOWUP)
 endef

package/pkg-cmake.mk

@@ -64,9 +64,8 @@ endef
 define cmake-package
 	$(call PREPARE)
 	$(call TARGET_CMAKE)
-	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+	$(call TARGET_MAKE)
-		$(MAKE); \
+	$(call TARGET_MAKE_INSTALL)
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(TARGET_RM) $(TARGET_libdir)/cmake
 	$(call TARGET_FOLLOWUP)
 endef
@@ -112,8 +111,7 @@ endef
 define host-cmake-package
 	$(call PREPARE)
 	$(call HOST_CMAKE)
-	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+	$(call HOST_MAKE)
-		$(MAKE); \
+	$(call HOST_MAKE_INSTALL)
-		$(MAKE) install
 	$(call HOST_FOLLOWUP)
 endef

package/pkg-generic.mk

@@ -0,0 +1,106 @@
+################################################################################
+#
+# Generic packages
+#
+################################################################################
+
+#TARGET_MAKE_ENV =
+#	$($(PKG)_MAKE_ENV)
+
+TARGET_MAKE_OPTS = \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	CC="$(TARGET_CC)" \
+	GCC="$(TARGET_CC)" \
+	CPP="$(TARGET_CPP)" \
+	CXX="$(TARGET_CXX)" \
+	LD="$(TARGET_LD)" \
+	AR="$(TARGET_AR)" \
+	AS="$(TARGET_AS)" \
+	NM="$(TARGET_NM)" \
+	OBJCOPY="$(TARGET_OBJCOPY)" \
+	OBJDUMP="$(TARGET_OBJDUMP)" \
+	RANLIB="$(TARGET_RANLIB)" \
+	READELF="$(TARGET_READELF)" \
+	STRIP="$(TARGET_STRIP)" \
+	ARCH=$(TARGET_ARCH)
+
+#TARGET_MAKE_OPTS += \
+#	$($(PKG)_MAKE_OPTS)
+
+define TARGET_MAKE
+	@$(call MESSAGE,"Compiling")
+	$(foreach hook,$($(PKG)_PRE_COMPILE_HOOKS),$(call $(hook))$(sep))
+	$(Q)( \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		$(MAKE); \
+	)
+	$(foreach hook,$($(PKG)_POST_COMPILE_HOOKS),$(call $(hook))$(sep))
+endef
+
+define TARGET_MAKE_INSTALL
+	@$(call MESSAGE,"Installing")
+	$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
+	$(Q)( \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		$(MAKE) install DESTDIR=$(TARGET_DIR); \
+	)
+	$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
+endef
+
+# -----------------------------------------------------------------------------
+
+define generic-package
+	$(call PREPARE)
+	$(call TARGET_MAKE)
+	$(call TARGET_MAKE_INSTALL)
+	$(call TARGET_FOLLOWUP)
+endef
+
+# -----------------------------------------------------------------------------
+
+#HOST_MAKE_ENV = \
+#	$($(PKG)_MAKE_ENV)
+
+HOST_MAKE_OPTS = \
+	CC="$(HOSTCC)" \
+	GCC="$(HOSTCC)" \
+	CPP="$(HOSTCPP)" \
+	CXX="$(HOSTCXX)" \
+	LD="$(HOSTLD)" \
+	AR="$(HOSTAR)" \
+	AS="$(HOSTAS)" \
+	NM="$(HOSTNM)" \
+	OBJCOPY="$(HOSTOBJCOPY)" \
+	RANLIB="$(HOSTRANLIB)"
+
+#HOST_MAKE_OPTS += \
+#	$($(PKG)_MAKE_OPTS)
+
+define HOST_MAKE
+	@$(call MESSAGE,"Compiling")
+	$(foreach hook,$($(PKG)_PRE_COMPILE_HOOKS),$(call $(hook))$(sep))
+	$(Q)( \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		$(MAKE); \
+	)
+	$(foreach hook,$($(PKG)_POST_COMPILE_HOOKS),$(call $(hook))$(sep))
+endef
+
+define HOST_MAKE_INSTALL
+	@$(call MESSAGE,"Installing")
+	$(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep))
+	$(Q)( \
+	$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
+		$(MAKE) install; \
+	)
+	$(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep))
+endef
+
+# -----------------------------------------------------------------------------
+
+define host-generic-package
+	$(call PREPARE)
+	$(call HOST_MAKE)
+	$(call HOST_MAKE_INSTALL)
+	$(call HOST_FOLLOWUP)
+endef