[PATCH 0/1] git 1.7.7: remove perl.mak before compile

[PATCH 0/1] git 1.7.7: remove perl.mak before compile

[Robert Yang]

Test info:

* $ bitbake git-native -ccompile
* $ touch tmp/sysroots/i686-linux/usr/lib/perl-native/perl/5.14.2/Config.pm
* $ bitake git-native -f -ccompile

git-native (or git) built successfully.

// Robert

The following changes since commit 1a82989345fb98becb487d270fd93a5e6dffeb47:

  runqemu-internal: Add console=tty for qemuppc and NFS (2012-04-06 01:12:15 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib robert/git
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/git

Robert Yang (1):
  git 1.7.7: remove perl.mak before compile

 meta/recipes-devtools/git/git.inc |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

[PATCH 1/1] git 1.7.7: remove perl.mak before compile

[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 <liezhi.yang@windriver.com>
---
 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 \
-- 
1.7.1

Re: [PATCH 0/1] git 1.7.7: remove perl.mak before compile

[Saul Wold]

On 04/09/2012 05:38 AM, Robert Yang wrote:
> Test info:
>
> * $ bitbake git-native -ccompile
> * $ touch tmp/sysroots/i686-linux/usr/lib/perl-native/perl/5.14.2/Config.pm
> * $ bitake git-native -f -ccompile
>
> git-native (or git) built successfully.
>
> // Robert
>
> The following changes since commit 1a82989345fb98becb487d270fd93a5e6dffeb47:
>
>    runqemu-internal: Add console=tty for qemuppc and NFS (2012-04-06 01:12:15 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib robert/git
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/git
>
> Robert Yang (1):
>    git 1.7.7: remove perl.mak before compile
>
>   meta/recipes-devtools/git/git.inc |    6 ++++++
>   1 files changed, 6 insertions(+), 0 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Merged into OE-Core

Thanks
	Sau!