summaryrefslogtreecommitdiffstats
path: root/recipes-security/AppArmor/files/disable_perl_h_check.patch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-06-13 22:18:45 -0400
committerArmin Kuster <akuster808@gmail.com>2017-07-31 08:14:38 -0700
commitac8db19e5027320a1ba1b99e41424bcbe566e40b (patch)
tree5d67658fe759864335befd10a61556c73d57ce1c /recipes-security/AppArmor/files/disable_perl_h_check.patch
parent89683b4fee4616a08d249bc7afd7be55f3fa71a3 (diff)
downloadmeta-security-ac8db19e5027320a1ba1b99e41424bcbe566e40b.tar.gz
apparmor: Rework such that the utilities are functional by default
This introduces a number of changes: - Fix the python PACKAGECONFIG knob - The included python support is python3-based, so use those classes. - When set, make sure to RDEPEND on the python modules the tools use. - Fix the perl PACKAGECONFIG knob - Add two patches so that configure will find perl and then compile will cross-compile the library correctly. - So that we place perl modules in the correct location we need cpan to be inherited. - When disabled, remove the RDEPENDS on perl as the RDEPENDS comes in via inherit. - Default to enabling the python and perl PACKAGECONFIG knobs as the majority of the userspace tools are python3 based, and the few that aren't that nor C based are perl based. - Because of the above we must drop the -python package because it's required for the utilities in the main package. Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security/AppArmor/files/disable_perl_h_check.patch')
-rw-r--r--recipes-security/AppArmor/files/disable_perl_h_check.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/recipes-security/AppArmor/files/disable_perl_h_check.patch b/recipes-security/AppArmor/files/disable_perl_h_check.patch
new file mode 100644
index 0000000..cf2640f
--- /dev/null
+++ b/recipes-security/AppArmor/files/disable_perl_h_check.patch
@@ -0,0 +1,19 @@
1Upstream-Status: Inappropriate [configuration]
2
3Remove file check for $perl_includedir/perl.h. AC_CHECK_FILE will fail on
4cross compilation. Rather than try and get a compile check to work here,
5we know that we have what's required via our metadata so remove only this
6check.
7
8Signed-Off-By: Tom Rini <trini@konsulko.com>
9
10--- a/libraries/libapparmor/configure.ac.orig 2017-06-13 16:41:38.668471495 -0400
11+++ b/libraries/libapparmor/configure.ac 2017-06-13 16:41:40.708471543 -0400
12@@ -58,7 +58,6 @@
13 AC_PATH_PROG(PERL, perl)
14 test -z "$PERL" && AC_MSG_ERROR([perl is required when enabling perl bindings])
15 perl_includedir="`$PERL -e 'use Config; print $Config{archlib}'`/CORE"
16- AC_CHECK_FILE($perl_includedir/perl.h, enable_perl=yes, enable_perl=no)
17 fi
18
19