From aa04edab77c75bc04ffb52755430bcdeb19c6d74 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Fri, 24 Apr 2020 10:31:59 +0200 Subject: [PATCH] package/apache: fixing apxs path mangling Latest version of Apache introduce a new apxs with a slightly modified path handling logic. In order to simplify the crosscompilation, the software removes the common prefix from bin install dir and build install dir, but for this to work they both should have a common prefix. So we introduce a new regexp to fix /usr/bin to staging dir, the regexps are also fixed to replace only the exact path between double quotes, to avoid replacing the she-bang line. Fixes: http://autobuild.buildroot.net/results/c41f31566974209897a3a1ec35afe2536fb248cc http://autobuild.buildroot.net/results/b93f19976ce96e79ea159c25ed74a7377c78f334 Signed-off-by: Angelo Compagnucci [yann.morin.1998@free.fr: - add the last few words about the she-bang blurb - do not use quotes in the existing /sur/bin regexp ] Signed-off-by: Yann E. MORIN --- package/apache/apache.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 48a64eae0e..068f36e325 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -99,6 +99,7 @@ APACHE_CONF_OPTS += --disable-deflate endif define APACHE_FIX_STAGING_APACHE_CONFIG + $(SED) 's%"/usr/bin"%"$(STAGING_DIR)/usr/bin"%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs $(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk endef