diff options
author | Tom Rini <trini@konsulko.com> | 2017-06-13 22:18:45 -0400 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-07-31 08:14:38 -0700 |
commit | ac8db19e5027320a1ba1b99e41424bcbe566e40b (patch) | |
tree | 5d67658fe759864335befd10a61556c73d57ce1c /recipes-security/AppArmor/files/crosscompile_perl_bindings.patch | |
parent | 89683b4fee4616a08d249bc7afd7be55f3fa71a3 (diff) | |
download | meta-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/crosscompile_perl_bindings.patch')
-rw-r--r-- | recipes-security/AppArmor/files/crosscompile_perl_bindings.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/recipes-security/AppArmor/files/crosscompile_perl_bindings.patch b/recipes-security/AppArmor/files/crosscompile_perl_bindings.patch new file mode 100644 index 0000000..ef55de7 --- /dev/null +++ b/recipes-security/AppArmor/files/crosscompile_perl_bindings.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | As we're cross-compiling here we need to override CC/LD that MakeMaker has | ||
4 | stuck in the generated Makefile with our cross tools. In this case, linking is | ||
5 | done via the compiler rather than the linker directly so pass in CC not LD | ||
6 | here. | ||
7 | |||
8 | Signed-Off-By: Tom Rini <trini@konsulko.com> | ||
9 | |||
10 | --- a/libraries/libapparmor/swig/perl/Makefile.am.orig 2017-06-13 19:04:43.296676212 -0400 | ||
11 | +++ b/libraries/libapparmor/swig/perl/Makefile.am 2017-06-13 19:05:03.488676693 -0400 | ||
12 | @@ -16,11 +16,11 @@ | ||
13 | |||
14 | LibAppArmor.so: libapparmor_wrap.c Makefile.perl | ||
15 | if test ! -f libapparmor_wrap.c; then cp $(srcdir)/libapparmor_wrap.c . ; fi | ||
16 | - $(MAKE) -fMakefile.perl | ||
17 | + $(MAKE) -fMakefile.perl CC='$(CC)' LD='$(CC)' | ||
18 | if test $(top_srcdir) != $(top_builddir) ; then rm -f libapparmor_wrap.c ; fi | ||
19 | |||
20 | install-exec-local: Makefile.perl | ||
21 | - $(MAKE) -fMakefile.perl install_vendor | ||
22 | + $(MAKE) -fMakefile.perl install_vendor CC='$(CC)' LD='$(CC)' | ||
23 | |||
24 | # sadly there is no make uninstall for perl | ||
25 | #uninstall-local: Makefile.perl | ||