From c0bf6acd394e72ca5398cede6be510219cafde91 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 27 Jun 2024 08:48:00 -0400 Subject: [PATCH] apparmor: fix build on musl, enable python on cross-compile --- srcpkgs/apparmor/template | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 13586d0976f979..c80e32b3503d04 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,13 +1,15 @@ # Template file for 'apparmor' pkgname=apparmor version=3.1.7 -revision=1 +revision=2 build_wrksrc=libraries/libapparmor build_style=gnu-configure conf_files="/etc/apparmor.d/local/* /etc/apparmor/*" make_dirs="/etc/apparmor.d/disable 0755 root root" +configure_args="--with-python" hostmakedepends="bison flex gettext python3 which python3-setuptools pkg-config - perl" + perl swig" +makedepends="python3-devel" depends="runit-void-apparmor libapparmor-${version}_${revision} python3-notify2 python3-psutil python3-dbus iproute2" checkdepends="dejagnu" @@ -21,9 +23,13 @@ checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64 replaces="apparmor-vim>=0" if [ -z "$CROSS_BUILD" ]; then - configure_args="--with-perl --with-python" - hostmakedepends+=" swig" - makedepends="python3-devel" + configure_args+=" --with-perl" +fi + +# /usr/lib/perl5/core_perl/CORE/perl.h:3360:22: error: unknown type name 'off64_t'; +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + CFLAGS+=" -D_LARGEFILE64_SOURCE" + CXXFLAGS+=" -D_LARGEFILE64_SOURCE" fi pre_build() {