From a80c27ece3fc110187dd7fbed032fb3f50ef7e6a Mon Sep 17 00:00:00 2001 From: Tyler Hicks Date: Mon, 4 Nov 2013 11:40:33 -0800 Subject: [PATCH] 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 Acked-by: Steve Beattie --- libraries/libapparmor/swig/perl/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/libapparmor/swig/perl/Makefile.am b/libraries/libapparmor/swig/perl/Makefile.am index 2ae5ecc8a..df42f5d0b 100644 --- a/libraries/libapparmor/swig/perl/Makefile.am +++ b/libraries/libapparmor/swig/perl/Makefile.am @@ -8,7 +8,9 @@ libapparmor_wrap.c: $(srcdir)/../SWIG/libapparmor.i 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=$@ sed -ie 's/^LD_RUN_PATH.*//g' Makefile.perl