From patchwork Tue Apr 10 07:26:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, [v2] 07/14] git 1.7.7: remove perl.mak before compile Date: Tue, 10 Apr 2012 07:26:34 -0000 From: Saul Wold X-Patchwork-Id: 25509 Message-Id: <8091bae14737a908742d983c3879b5f89009dde4.1334042473.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Robert Yang The git may fail to rebuild when perl's Config.pm or config.h changes, this is because Makefile detects that perl/perl.mak is out of date. Remove perl.mak to let Makefile regenerate it would fix the error. Both git and git-native have this problem. To reproduce the error: (On x86_64 host) $ bitbake git-native $ touch tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.14.2/Config.pm $ bitbake git-native -ccompile -f [YOCTO #2156] Signed-off-by: Robert Yang --- meta/recipes-devtools/git/git.inc | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index be3831b..ce2f574 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -12,6 +12,12 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --without- inherit autotools perlnative +do_compile_prepend () { + # Remove perl/perl.mak to fix the out-of-date perl.mak error + # during rebuild + rm -f perl/perl.mak +} + do_install () { oe_runmake install DESTDIR="${D}" bindir=${bindir} \ template_dir=${datadir}/git-core/templates \