NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/apr-util: use post-prepare hook

Browse Source 
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
<PKG>_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
<PKG>_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 <herve.codina@bootlin.com>
Reviewed-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Herve Codina 2021-07-06 16:24:48 +02:00 committed by Yann E. MORIN
parent 80168aa3c6
commit ead700f87c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/apr-util/apr-util.mk
View File

@ -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