8bd40a0303
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 commit3c836e5420was incomplete as the apr special libtool script was not patched (see commitb747c29c4efor a detailled explanation) Fixes: - http://autobuild.buildroot.org/results/6747b1cb11b129ea4bcb1ecc9645e94fb8e095e8 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
98 lines
2.9 KiB
Makefile
98 lines
2.9 KiB
Makefile
################################################################################
|
|
#
|
|
# apparmor
|
|
#
|
|
################################################################################
|
|
|
|
# When updating the version here, please also update the libapparmor package
|
|
APPARMOR_VERSION_MAJOR = 3.0
|
|
APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).3
|
|
APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download
|
|
APPARMOR_DL_SUBDIR = libapparmor
|
|
APPARMOR_LICENSE = GPL-2.0
|
|
APPARMOR_LICENSE_FILES = LICENSE parser/COPYING.GPL
|
|
APPARMOR_CPE_ID_VENDOR = canonical
|
|
|
|
APPARMOR_DEPENDENCIES = libapparmor
|
|
|
|
APPARMOR_TOOLS = parser
|
|
APPARMOR_MAKE_OPTS = USE_SYSTEM=1 DISTRO=unknown POD2MAN=true POD2HTML=true
|
|
|
|
ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
|
|
APPARMOR_DEPENDENCIES += gettext
|
|
APPARMOR_MAKE_OPTS += WITH_LIBINTL=1
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_APPARMOR_BINUTILS),y)
|
|
APPARMOR_TOOLS += binutils
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_APPARMOR_UTILS),y)
|
|
APPARMOR_DEPENDENCIES += host-python3 python3
|
|
APPARMOR_TOOLS += utils
|
|
APPARMOR_MAKE_OPTS += PYTHON=$(HOST_DIR)/bin/python3
|
|
|
|
ifeq ($(BR2_PACKAGE_APPARMOR_UTILS_EXTRA),)
|
|
define APPARMOR_UTILS_NO_EXTRA
|
|
$(Q)rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,aa-decode aa-notify aa-remove-unknown)
|
|
endef
|
|
APPARMOR_POST_INSTALL_TARGET_HOOKS += APPARMOR_UTILS_NO_EXTRA
|
|
endif # BR2_PACKAGE_APPARMOR_UTILS_EXTRA
|
|
|
|
endif # BR2_PACKAGE_APPARMOR_UTILS
|
|
|
|
ifeq ($(BR2_PACKAGE_APPARMOR_PROFILES),y)
|
|
APPARMOR_TOOLS += profiles
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
|
|
APPARMOR_DEPENDENCIES += linux-pam
|
|
APPARMOR_TOOLS += changehat/pam_apparmor
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_APACHE),y)
|
|
APPARMOR_DEPENDENCIES += apache
|
|
APPARMOR_TOOLS += changehat/mod_apparmor
|
|
APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs
|
|
|
|
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-1/libtool
|
|
endef
|
|
APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS
|
|
endif
|
|
endif
|
|
|
|
define APPARMOR_BUILD_CMDS
|
|
$(foreach tool,$(APPARMOR_TOOLS),\
|
|
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
|
|
$(MAKE) -C $(@D)/$(tool) $(APPARMOR_MAKE_OPTS)
|
|
)
|
|
endef
|
|
|
|
define APPARMOR_INSTALL_TARGET_CMDS
|
|
$(foreach tool,$(APPARMOR_TOOLS),\
|
|
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
|
|
$(MAKE) -C $(@D)/$(tool) $(APPARMOR_MAKE_OPTS) \
|
|
DESTDIR=$(TARGET_DIR) install
|
|
)
|
|
endef
|
|
|
|
# Despite its name, apparmor.systemd is a sysv-init compatible startup script
|
|
define APPARMOR_INSTALL_INIT_SYSV
|
|
$(INSTALL) -D -m 0755 $(@D)/parser/apparmor.systemd \
|
|
$(TARGET_DIR)/etc/init.d/S00apparmor
|
|
endef
|
|
|
|
define APPARMOR_INSTALL_INIT_SYSTEMD
|
|
$(INSTALL) -D -m 0755 $(@D)/parser/apparmor.systemd \
|
|
$(TARGET_DIR)/lib/apparmor/apparmor.systemd
|
|
$(INSTALL) -D -m 0644 $(@D)/parser/apparmor.service \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/apparmor.service
|
|
endef
|
|
|
|
$(eval $(generic-package))
|