Browse Source

- move individual define to pkg_individual.mk

master
vanhofen 3 years ago
parent
commit
aa967977c4
  1. 9
      make/buildsystem-helpers.mk
  2. 4
      package/pkg-autotools.mk
  3. 4
      package/pkg-cmake.mk
  4. 10
      package/pkg-individual.mk
  5. 6
      package/pkg-meson.mk
  6. 2
      package/pkg-python.mk

9
make/buildsystem-helpers.mk

@ -152,15 +152,6 @@ endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# individual build
define INDIVIDUAL
@$(call MESSAGE,"Individual build")
$(foreach hook,$($(PKG)_INDIVIDUAL_HOOKS),$(call $(hook))$(sep))
$(TOUCH)
endef
# -----------------------------------------------------------------------------
# follow-up build # follow-up build
define HOST_FOLLOWUP define HOST_FOLLOWUP
@$(call MESSAGE,"Follow-up build") @$(call MESSAGE,"Follow-up build")

4
package/pkg-autotools.mk

@ -63,6 +63,8 @@ define TARGET_CONFIGURE
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef
# -----------------------------------------------------------------------------
define autotools-package define autotools-package
$(call PREPARE) $(call PREPARE)
$(call TARGET_CONFIGURE) $(call TARGET_CONFIGURE)
@ -108,6 +110,8 @@ define HOST_CONFIGURE
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef
# -----------------------------------------------------------------------------
define host-autotools-package define host-autotools-package
$(call PREPARE) $(call PREPARE)
$(call HOST_CONFIGURE) $(call HOST_CONFIGURE)

4
package/pkg-cmake.mk

@ -59,6 +59,8 @@ define TARGET_CMAKE
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef
# -----------------------------------------------------------------------------
define cmake-package define cmake-package
$(call PREPARE) $(call PREPARE)
$(call TARGET_CMAKE) $(call TARGET_CMAKE)
@ -105,6 +107,8 @@ define HOST_CMAKE
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef
# -----------------------------------------------------------------------------
define host-cmake-package define host-cmake-package
$(call PREPARE) $(call PREPARE)
$(call HOST_CMAKE) $(call HOST_CMAKE)

10
package/pkg-individual.mk

@ -4,12 +4,22 @@
# #
################################################################################ ################################################################################
define INDIVIDUAL
@$(call MESSAGE,"Individual build")
$(foreach hook,$($(PKG)_INDIVIDUAL_HOOKS),$(call $(hook))$(sep))
$(TOUCH)
endef
# -----------------------------------------------------------------------------
define individual-package define individual-package
$(call PREPARE) $(call PREPARE)
$(call INDIVIDUAL) $(call INDIVIDUAL)
$(call TARGET_FOLLOWUP) $(call TARGET_FOLLOWUP)
endef endef
# -----------------------------------------------------------------------------
define host-individual-package define host-individual-package
$(call PREPARE) $(call PREPARE)
$(call INDIVIDUAL) $(call INDIVIDUAL)

6
package/pkg-meson.mk

@ -40,6 +40,8 @@ define MESON_CROSS_CONFIG_HOOK # (dest dir)
) > $(1)/meson-cross.config ) > $(1)/meson-cross.config
endef endef
# -----------------------------------------------------------------------------
define TARGET_MESON_CONFIGURE define TARGET_MESON_CONFIGURE
@$(call MESSAGE,"Configuring") @$(call MESSAGE,"Configuring")
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
@ -70,6 +72,8 @@ define TARGET_NINJA_INSTALL
$(HOST_NINJA_BINARY) -C $(PKG_BUILD_DIR)/build install $(HOST_NINJA_BINARY) -C $(PKG_BUILD_DIR)/build install
endef endef
# -----------------------------------------------------------------------------
define meson-package define meson-package
$(call PREPARE) $(call PREPARE)
$(call TARGET_MESON_CONFIGURE) $(call TARGET_MESON_CONFIGURE)
@ -109,6 +113,8 @@ define HOST_NINJA_INSTALL
$(HOST_NINJA_BINARY) -C $(PKG_BUILD_DIR)/build install $(HOST_NINJA_BINARY) -C $(PKG_BUILD_DIR)/build install
endef endef
# -----------------------------------------------------------------------------
define host-meson-package define host-meson-package
$(call PREPARE) $(call PREPARE)
$(call HOST_MESON_CONFIGURE) $(call HOST_MESON_CONFIGURE)

2
package/pkg-python.mk

@ -28,6 +28,8 @@ define HOST_PYTHON3_INSTALL
$(HOST_PYTHON3_OPTS) $(HOST_PYTHON3_OPTS)
endef endef
# -----------------------------------------------------------------------------
define host-python3-package define host-python3-package
$(call PREPARE) $(call PREPARE)
$(call HOST_PYTHON3_BUILD) $(call HOST_PYTHON3_BUILD)

Loading…
Cancel
Save