topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- pkg-autotools: change AUTORECONF_HOOK

master
vanhofen 3 years ago
parent
a04bf0a004
commit
790e28cb37
2 changed files with 8 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      package/pkg-autotools.mk
  2. 10
      package/pkg-utils.mk

8
package/pkg-autotools.mk
View File

@ -5,15 +5,13 @@
################################################################################ ################################################################################
define AUTORECONF_HOOK define AUTORECONF_HOOK
$(Q)( \
if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \ if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \
$(call MESSAGE,"Autoreconfiguring"); \ $(call MESSAGE,"Autoreconfiguring"); \
$(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \
$($(PKG)_AUTORECONF_ENV) \ $($(PKG)_AUTORECONF_ENV) \
$($(PKG)_AUTORECONF_CMD) \ $($(PKG)_AUTORECONF_CMD) \
$($(PKG)_AUTORECONF_OPTS); \ $($(PKG)_AUTORECONF_OPTS); \
fi; \ fi
)
endef endef
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -75,7 +73,7 @@ endef
define TARGET_CONFIGURE define TARGET_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))
$(call AUTORECONF_HOOK) $(Q)$(call AUTORECONF_HOOK)
$(Q)$(call $(PKG)_CONFIGURE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef
@ -131,7 +129,7 @@ endef
define HOST_CONFIGURE define HOST_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))
$(call AUTORECONF_HOOK) $(Q)$(call AUTORECONF_HOOK)
$(Q)$(call $(PKG)_CONFIGURE_CMDS) $(Q)$(call $(PKG)_CONFIGURE_CMDS)
$(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
endef endef

10
package/pkg-utils.mk
View File

@ -23,7 +23,7 @@ define PKG_CHECK_VARIABLES
# patch # patch
ifndef $(PKG)_PATCH ifndef $(PKG)_PATCH
$(PKG)_PATCH = $(PKG_PATCHES_DIR) $(PKG)_PATCH = $$(PKG_PATCHES_DIR)
endif endif
ifndef $(PKG)_PATCH_CUSTOM ifndef $(PKG)_PATCH_CUSTOM
$(PKG)_PATCH_CUSTOM = $(PKG)_PATCH_CUSTOM =
@ -66,7 +66,7 @@ endif
# make # make
ifndef $(PKG)_MAKE ifndef $(PKG)_MAKE
$(PKG)_MAKE = $(MAKE) $(PKG)_MAKE = $$(MAKE)
endif endif
ifndef $(PKG)_MAKE_ENV ifndef $(PKG)_MAKE_ENV
$(PKG)_MAKE_ENV = $(PKG)_MAKE_ENV =
@ -80,16 +80,16 @@ endif
# make install # make install
ifndef $(PKG)_MAKE_INSTALL ifndef $(PKG)_MAKE_INSTALL
$(PKG)_MAKE_INSTALL = $($(PKG)_MAKE) $(PKG)_MAKE_INSTALL = $$($(PKG)_MAKE)
endif endif
ifndef $(PKG)_MAKE_INSTALL_ENV ifndef $(PKG)_MAKE_INSTALL_ENV
$(PKG)_MAKE_INSTALL_ENV = $($(PKG)_MAKE_ENV) $(PKG)_MAKE_INSTALL_ENV = $$($(PKG)_MAKE_ENV)
endif endif
ifndef $(PKG)_MAKE_INSTALL_ARGS ifndef $(PKG)_MAKE_INSTALL_ARGS
$(PKG)_MAKE_INSTALL_ARGS = install $(PKG)_MAKE_INSTALL_ARGS = install
endif endif
ifndef $(PKG)_MAKE_INSTALL_OPTS ifndef $(PKG)_MAKE_INSTALL_OPTS
$(PKG)_MAKE_INSTALL_OPTS = $($(PKG)_MAKE_OPTS) $(PKG)_MAKE_INSTALL_OPTS = $$($(PKG)_MAKE_OPTS)
endif endif
# ninja # ninja

Write Preview
Loading…
Cancel
Save