summaryrefslogtreecommitdiff
path: root/meta
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:15:59 +0100
commit7f9a3eb4e81f708573cfd5123655441d3b9532a5 (patch)
tree27d0b22b4e9c5d0971310165ce35ac8e119f4ea8 /meta
parenta2c6687410f00623efe8dfcb22385cbbc7f2e1a9 (diff)
downloadopenembedded-core-7f9a3eb4e81f708573cfd5123655441d3b9532a5.tar.gz
openembedded-core-7f9a3eb4e81f708573cfd5123655441d3b9532a5.tar.bz2
openembedded-core-7f9a3eb4e81f708573cfd5123655441d3b9532a5.tar.xz
openembedded-core-7f9a3eb4e81f708573cfd5123655441d3b9532a5.zip
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] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta')
-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 be3831b76..ce2f5742f 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 \