From 790e28cb374481bf524124bf68e54cbdaaaba973 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 6 Jul 2022 16:38:20 +0200 Subject: [PATCH] - pkg-autotools: change AUTORECONF_HOOK --- package/pkg-autotools.mk | 8 +++----- package/pkg-utils.mk | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk index 873ffd92..a7fb75ac 100644 --- a/package/pkg-autotools.mk +++ b/package/pkg-autotools.mk @@ -5,15 +5,13 @@ ################################################################################ define AUTORECONF_HOOK - $(Q)( \ if [ "$($(PKG)_AUTORECONF)" == "YES" ]; then \ $(call MESSAGE,"Autoreconfiguring"); \ $(CHDIR)/$($(PKG)_DIR)/$($(PKG)_SUBDIR); \ $($(PKG)_AUTORECONF_ENV) \ $($(PKG)_AUTORECONF_CMD) \ $($(PKG)_AUTORECONF_OPTS); \ - fi; \ - ) + fi endef # ----------------------------------------------------------------------------- @@ -75,7 +73,7 @@ endef define TARGET_CONFIGURE @$(call MESSAGE,"Configuring") $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) - $(call AUTORECONF_HOOK) + $(Q)$(call AUTORECONF_HOOK) $(Q)$(call $(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) endef @@ -131,7 +129,7 @@ endef define HOST_CONFIGURE @$(call MESSAGE,"Configuring") $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) - $(call AUTORECONF_HOOK) + $(Q)$(call AUTORECONF_HOOK) $(Q)$(call $(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) endef diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index e59b8eaf..e165fbbe 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -23,7 +23,7 @@ define PKG_CHECK_VARIABLES # patch ifndef $(PKG)_PATCH - $(PKG)_PATCH = $(PKG_PATCHES_DIR) + $(PKG)_PATCH = $$(PKG_PATCHES_DIR) endif ifndef $(PKG)_PATCH_CUSTOM $(PKG)_PATCH_CUSTOM = @@ -66,7 +66,7 @@ endif # make ifndef $(PKG)_MAKE - $(PKG)_MAKE = $(MAKE) + $(PKG)_MAKE = $$(MAKE) endif ifndef $(PKG)_MAKE_ENV $(PKG)_MAKE_ENV = @@ -80,16 +80,16 @@ endif # make install ifndef $(PKG)_MAKE_INSTALL - $(PKG)_MAKE_INSTALL = $($(PKG)_MAKE) + $(PKG)_MAKE_INSTALL = $$($(PKG)_MAKE) endif ifndef $(PKG)_MAKE_INSTALL_ENV - $(PKG)_MAKE_INSTALL_ENV = $($(PKG)_MAKE_ENV) + $(PKG)_MAKE_INSTALL_ENV = $$($(PKG)_MAKE_ENV) endif ifndef $(PKG)_MAKE_INSTALL_ARGS $(PKG)_MAKE_INSTALL_ARGS = install endif ifndef $(PKG)_MAKE_INSTALL_OPTS - $(PKG)_MAKE_INSTALL_OPTS = $($(PKG)_MAKE_OPTS) + $(PKG)_MAKE_INSTALL_OPTS = $$($(PKG)_MAKE_OPTS) endif # ninja