summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-04-09 16:37:12 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-10 13:32:00 +0100
commitb0550403d4e499a6c165c03825d3e4f9e2a750ad (patch)
treef7ec98fa676fb23fc71a600a7bc3039f20814738
parentc13afae688fa96f03ac2a161e293434ad949374b (diff)
downloadpoky-b0550403d4e499a6c165c03825d3e4f9e2a750ad.tar.gz
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 <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/git/git.inc6
1 files changed, 6 insertions, 0 deletions
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-
12 12
13inherit autotools perlnative 13inherit autotools perlnative
14 14
15do_compile_prepend () {
16 # Remove perl/perl.mak to fix the out-of-date perl.mak error
17 # during rebuild
18 rm -f perl/perl.mak
19}
20
15do_install () { 21do_install () {
16 oe_runmake install DESTDIR="${D}" bindir=${bindir} \ 22 oe_runmake install DESTDIR="${D}" bindir=${bindir} \
17 template_dir=${datadir}/git-core/templates \ 23 template_dir=${datadir}/git-core/templates \