From a29ab5af9d78db38a696202c7482445a90ab717f 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 | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template index 13586d0976f979..f4aef566ddc132 100644 --- a/srcpkgs/apparmor/template +++ b/srcpkgs/apparmor/template @@ -1,7 +1,7 @@ # 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/*" @@ -20,10 +20,22 @@ distfiles="https://launchpad.net/apparmor/${version%.*}/${version}/+download/app checksum=c6c161d6dbd99c2f10758ff347cbc6848223c7381f311de62522f22b0a16de64 replaces="apparmor-vim>=0" +case "$XBPS_TARGET_MACHINE" in + x86_64*|aarch64*|i686*) + configure_args+=" --with-python" + hostmakedepends+=" swig" + makedepends+=" python3-devel" + ;; +esac + 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() {