From 89d1ad91fe4b1b65f0e902f94aba99a6cefbf631 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 4 Nov 2010 03:50:24 +0100 Subject: [PATCH] package: move autoreconfigure step to pre configure hook [Peter: update documentation to match] Signed-off-by: Lionel Landwerlin Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- docs/buildroot.html | 1 + package/Makefile.autotools.in | 2 +- package/Makefile.package.in | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/buildroot.html b/docs/buildroot.html index 00808ffc40..a94e7befa3 100644 --- a/docs/buildroot.html +++ b/docs/buildroot.html @@ -1123,6 +1123,7 @@ endef
  • LIBFOO_POST_PATCH_HOOKS
    • +
  • LIBFOO_PRE_CONFIGURE_HOOKS
  • LIBFOO_POST_CONFIGURE_HOOKS
  • LIBFOO_POST_BUILD_HOOKS
  • LIBFOO_POST_INSTALL_HOOKS (for host packages only)
    • diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index b24c2b1af9..3e21369379 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -177,7 +177,7 @@ define AUTORECONF_HOOK endef ifeq ($$($(2)_AUTORECONF),YES) -$(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK +$(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK $(2)_DEPENDENCIES += host-automake host-autoconf host-libtool endif diff --git a/package/Makefile.package.in b/package/Makefile.package.in index 377df65c0b..816a01323d 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -261,6 +261,7 @@ $(BUILD_DIR)/%/.stamp_patched: # Configure $(BUILD_DIR)/%/.stamp_configured: + $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) @$(call MESSAGE,"Configuring") $($(PKG)_CONFIGURE_CMDS) $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) @@ -410,6 +411,7 @@ $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned # post-steps hooks $(2)_POST_EXTRACT_HOOKS ?= $(2)_POST_PATCH_HOOKS ?= +$(2)_PRE_CONFIGURE_HOOKS ?= $(2)_POST_CONFIGURE_HOOKS ?= $(2)_POST_BUILD_HOOKS ?= $(2)_POST_INSTALL_HOOKS ?= -- 2.30.2