From 8bd40a0303c697822f2c65b4ede80ad1252bbc07 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 17 Nov 2021 18:31:52 +0100 Subject: [PATCH] package/apparmor: fix per-package build with apache Fix the following per-package build failure with apache: /home/buildroot/autobuild/instance-3/output-1/per-package/apparmor/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/../../usr/build-1/libtool --silent --mode=link /home/buildroot/autobuild/instance-3/output-1/per-package/apparmor/host/bin/aarch64-linux-gcc -o mod_apparmor.la -rpath /usr/modules -module -avoid-version mod_apparmor.lo -L/home/buildroot/autobuild/instance-3/output-1/per-package/apparmor/host/bin/../aarch64-buildroot-linux-gnu/sysroot/usr/lib -lapparmor /home/buildroot/autobuild/instance-3/output-1/per-package/apache/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-buildroot-linux-gnu/9.3.0/../../../../aarch64-buildroot-linux-gnu/bin/ld: cannot find /lib64/libc.so.6 This build failure is raised because the fix added by commit 3c836e54203b16015c9c52cbe007adc92d293a0d was incomplete as the apr special libtool script was not patched (see commit b747c29c4e8eb89b7b99658dfd34f4a6b6b0744d for a detailled explanation) Fixes: - http://autobuild.buildroot.org/results/6747b1cb11b129ea4bcb1ecc9645e94fb8e095e8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/apparmor/apparmor.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/apparmor/apparmor.mk b/package/apparmor/apparmor.mk index 400ea349ae..6f0e59224d 100644 --- a/package/apparmor/apparmor.mk +++ b/package/apparmor/apparmor.mk @@ -59,7 +59,8 @@ ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) define APPARMOR_FIXUP_APXS $(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \ $(STAGING_DIR)/usr/bin/apxs \ - $(STAGING_DIR)/usr/build/config_vars.mk + $(STAGING_DIR)/usr/build/config_vars.mk \ + $(STAGING_DIR)/usr/build-1/libtool endef APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS endif