mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -15,6 +15,16 @@ 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_RULES_MK_LIBTOOL
|
||||
$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
|
||||
$(@D)/build/rules.mk
|
||||
$(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
|
||||
endif
|
||||
|
||||
# When iconv is available, then use it to provide charset conversion
|
||||
# features.
|
||||
APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
|
||||
Reference in New Issue
Block a user