From 84b4c19e551288911a230c2b73e96bc6e2ed12f9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 18 Feb 2020 00:46:38 +0100 Subject: [PATCH] package/apr-util: fix build with per-package directories With per-package directories support enabled, the build of apr-util fails, for two reasons: - The rules.mk file is generated by the 'apr' package, and then copied into the 'apr-util' source directory. This is done by the 'apr-util' build process. Unfortunately, this rules.mk file has a number of hardcoded paths: to the compiler and to the libtool script. Due to this, the compiler from the 'apr' per-package directory gets used. But this compiler uses the 'apr' package sysroot, which does not have all the dependencies of the 'apr-util' package, causing the build to fail because is not found. - Similarly, the libtool script itself has some hardcoded paths, which make it use the compiler/linker from the 'apr' per-package directory, so it does not find the expat library. We fix both issues by doing the necessary replacement in both rules.mk and libtool. Fixes: http://autobuild.buildroot.net/results/2a67b5d58f79348e20a972125e4797eff5585716/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/apr-util/apr-util.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index b006964ccb..53b633b159 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -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) -- 2.30.2