From b0550403d4e499a6c165c03825d3e4f9e2a750ad Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 9 Apr 2012 16:37:12 +0800 Subject: git 1.7.7: remove perl.mak before compile 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] (From OE-Core rev: 7f9a3eb4e81f708573cfd5123655441d3b9532a5) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/git/git.inc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index be3831b768..ce2f5742f1 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 \ -- cgit v1.2.3-54-g00ecf