From: Johan Oudinet <johan.oudinet@gmail.com>
Date: Wed, 12 Nov 2014 00:25:50 +0000 (+0100)
Subject: pkg-autotools: move the libtool patching call out of the autoreconf hook
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2ae901036897bd9b4a0c3b2835a70667c076bf5;p=buildroot.git

pkg-autotools: move the libtool patching call out of the autoreconf hook

Call it as a standalone hook, like is done for post-patch.

[Thomas: change back the author to Johan. Yann mistakenly changed it
when submitting the patch series.]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
[yann.morin.1998@free.fr: split the patch into semantically separate
patches]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 393f995644..45947b0088 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -98,7 +98,6 @@ endef
 define AUTORECONF_HOOK
 	@$(call MESSAGE,"Autoreconfiguring")
 	$(Q)cd $($(PKG)_SRCDIR) && $($(PKG)_AUTORECONF_ENV) $(AUTORECONF) $($(PKG)_AUTORECONF_OPTS)
-	$(call PATCH_LIBTOOL,$($(PKG)_SRCDIR))
 endef
 
 ################################################################################
@@ -260,6 +259,10 @@ $(2)_PRE_CONFIGURE_HOOKS += GETTEXTIZE_HOOK
 $(2)_DEPENDENCIES += host-gettext
 endif
 $(2)_PRE_CONFIGURE_HOOKS += AUTORECONF_HOOK
+# default values are not evaluated yet, so don't rely on this defaulting to YES
+ifneq ($$($(2)_LIBTOOL_PATCH),NO)
+$(2)_PRE_CONFIGURE_HOOKS += LIBTOOL_PATCH_HOOK
+endif
 $(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
 endif