From a31bb84e32046d33f50d2ef9c87ca948a05eaeea Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 29 Apr 2021 15:38:34 -0700 Subject: apache2: Deal with -ffile-prefix-map Filter out -ffile-prefix-map as well along with other -f*-prefix-map options Signed-off-by: Khem Raj --- meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb index 197cb83e64..e84f7eaa2a 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.46.bb @@ -115,7 +115,7 @@ do_install_append_class-target() { sed -i -e 's,${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk @@ -123,7 +123,7 @@ do_install_append_class-target() { sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ - -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ + -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice -- cgit 1.2.3-korg