mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-08-30 13:58:22 +00:00
LibAppArmor.pm: Adjust Makefile dependencies to support parallel builds
The libapparmor_wrap.c target generates libapparmor_wrap.c and LibAppArmor.pm. The Perl module must exist before `perl Makefile.PL` under the Makefile.perl target, otherwise the generated Makefile.perl ends up with an empty $(TO_INST_PM) variable and the pm_to_blib target's dependencies are incomplete. That results in the Perl module not getting copied to the blib directory and a build that is missing LibAppArmor.pm. A build missing LibAppArmor.pm only occurred while building with multiple threads. Thanks to Seth Arnold for the suggestion on how to best fix the dependencies. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
@@ -8,7 +8,9 @@ libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i
|
|||||||
|
|
||||||
MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.pm
|
MOSTLYCLEANFILES=libapparmor_wrap.c LibAppArmor.pm
|
||||||
|
|
||||||
Makefile.perl: Makefile.PL
|
LibAppArmor.pm: libapparmor_wrap.c
|
||||||
|
|
||||||
|
Makefile.perl: Makefile.PL LibAppArmor.pm
|
||||||
$(PERL) $< PREFIX=$(prefix) MAKEFILE=$@
|
$(PERL) $< PREFIX=$(prefix) MAKEFILE=$@
|
||||||
sed -ie 's/^LD_RUN_PATH.*//g' Makefile.perl
|
sed -ie 's/^LD_RUN_PATH.*//g' Makefile.perl
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user