diff --git a/make/environment-build.mk b/make/environment-build.mk index fbbc81f7..d7caf37c 100644 --- a/make/environment-build.mk +++ b/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 diff --git a/package/Makefile.in b/package/Makefile.in index a3fb0a0f..aae560fd 100644 --- a/package/Makefile.in +++ b/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 diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index e532c3b1..6bdca1ac 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -68,9 +68,8 @@ endef define autotools-package $(call PREPARE) $(call TARGET_CONFIGURE) - $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ - $(MAKE); \ - $(MAKE) install DESTDIR=$(TARGET_DIR) + $(call TARGET_MAKE) + $(call TARGET_MAKE_INSTALL) $(call TARGET_FOLLOWUP) endef @@ -115,8 +114,7 @@ endef define host-autotools-package $(call PREPARE) $(call HOST_CONFIGURE) - $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ - $(MAKE); \ - $(MAKE) install + $(call HOST_MAKE) + $(call HOST_MAKE_INSTALL) $(call HOST_FOLLOWUP) endef diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 55deaed5..a79de5ce 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -64,9 +64,8 @@ endef define cmake-package $(call PREPARE) $(call TARGET_CMAKE) - $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ - $(MAKE); \ - $(MAKE) install DESTDIR=$(TARGET_DIR) + $(call TARGET_MAKE) + $(call TARGET_MAKE_INSTALL) $(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); \ - $(MAKE); \ - $(MAKE) install + $(call HOST_MAKE) + $(call HOST_MAKE_INSTALL) $(call HOST_FOLLOWUP) endef diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk new file mode 100644 index 00000000..62b1dc8e --- /dev/null +++ b/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