From mboxrd@z Thu Jan 1 00:00:00 1970 From: Herve Codina Date: Tue, 6 Jul 2021 16:24:48 +0200 Subject: [Buildroot] [PATCH v2 05/18] package/apr-util: use post-prepare hook In-Reply-To: <20210706142501.951345-1-herve.codina@bootlin.com> References: <20210706142501.951345-1-herve.codina@bootlin.com> Message-ID: <20210706142501.951345-6-herve.codina@bootlin.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Original APR_UTIL_FIX_RULES_MK_LIBTOOL tweaked libtool and rules.mk. libtool is provided by a dependency (apr). It needs to be tweaked and, as an apr-util external file, this tweak is relevant in _POST_PREPARE_HOOKS. rules.mk is generated by apr-util configure step and it is private to apr-util. The modification performed needs to be kept in _POST_CONFIGURE_HOOKS. This commit splits original APR_UTIL_FIX_RULES_MK_LIBTOOL and attaches each part to the correct hook. Signed-off-by: Herve Codina Reviewed-by: Yann E. MORIN --- Changes v1 to v2: - Renamed _PER_PACKAGE_TWEAK_HOOKS to _POST_PREPARE_HOOKS - Added 'Reviewed-by: Yann E. MORIN' package/apr-util/apr-util.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index db4df91564..f6ce7ac064 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -18,13 +18,17 @@ APR_UTIL_CONF_OPTS = \ APR_UTIL_CONFIG_SCRIPTS = apu-1-config ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -define APR_UTIL_FIX_RULES_MK_LIBTOOL - $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ - $(@D)/build/rules.mk +define APR_UTIL_FIX_LIBTOOL $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ $(STAGING_DIR)/usr/build-1/libtool endef -APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK_LIBTOOL +APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL + +define APR_UTIL_FIX_RULES_MK + $(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \ + $(@D)/build/rules.mk +endef +APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK endif # When iconv is available, then use it to provide charset conversion -- 2.31.1