From a50c9f16edfe36c9ef4a210621b062493fdd09fd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 19 Feb 2022 15:21:04 +0100 Subject: [PATCH] package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK} Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit 84b4c19e551288911a230c2b73e96bc6e2ed12f9 but is not needed since the addition of PPD_FIXUP_PATHS in commit b06294e9897e90862656416e8b67fdace15488d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/apr-util/apr-util.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index f6ce7ac064..cf8407ced0 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \ --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config APR_UTIL_CONFIG_SCRIPTS = apu-1-config -ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) -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_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 # features. APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)