summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-11-04 03:50:24 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2010-11-05 10:03:29 +0100
commit89d1ad91fe4b1b65f0e902f94aba99a6cefbf631 (patch)
tree0e60718831c6079622aeff26b0ec283c40f95ef5
parent3256bcafb57999b3807ef73e4525ee5d2e462668 (diff)
package: move autoreconfigure step to pre configure hook
[Peter: update documentation to match] Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--docs/buildroot.html1
-rw-r--r--package/Makefile.autotools.in2
-rw-r--r--package/Makefile.package.in2
3 files changed, 4 insertions, 1 deletions
diff --git a/docs/buildroot.html b/docs/buildroot.html
index 00808ffc4..a94e7befa 100644
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -1123,6 +1123,7 @@ endef
<ul>
<li><code>LIBFOO_POST_PATCH_HOOKS</code></li>
+ <li><code>LIBFOO_PRE_CONFIGURE_HOOKS</code></li>
<li><code>LIBFOO_POST_CONFIGURE_HOOKS</code></li>
<li><code>LIBFOO_POST_BUILD_HOOKS</code></li>
<li><code>LIBFOO_POST_INSTALL_HOOKS</code> (for host packages only)</li>
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index b24c2b1af..3e2136937 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 377df65c0..816a01323 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 ?=