From 218bcd597d4ba7b0a51f8e09bd7bff5e610676e4 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Fri, 10 Jun 2011 15:25:19 +0800 Subject: git: restore the dependency on perl-native [YOCTO #1155] I thought git-native could depend on perl-native-runtime and tests on Ubuntu 9.04/10.10 and Fedora 13 show it could buid fine (looks these distros install perl-ExtUtils-MakeMaker by default). However Joshua reported on Fedora 15 i686 host, git-native can't build unless he manually installed perl-ExtUtils-MakeMaker to the host. This makes me think we may as well make git-native depend on perl-native. Signed-off-by: Dexuan Cui --- meta/recipes-devtools/git/git.inc | 6 +++--- meta/recipes-devtools/git/git_1.7.5.1.bb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools/git') diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 3cdd1fae50..5d778805ad 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -1,16 +1,16 @@ DESCRIPTION = "The git revision control system used by the Linux kernel developers" SECTION = "console/utils" LICENSE = "GPLv2" -DEPENDS = "perl-native-runtime openssl curl zlib expat" +DEPENDS = "openssl curl zlib expat" SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 " S = "${WORKDIR}/git-${PV}" LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" -EXTRA_OECONF = "--without-tcltk" +EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --without-tcltk" -inherit autotools +inherit autotools perlnative do_install () { oe_runmake install DESTDIR="${D}" bindir=${bindir} \ diff --git a/meta/recipes-devtools/git/git_1.7.5.1.bb b/meta/recipes-devtools/git/git_1.7.5.1.bb index 9aa2bdff9a..04d1d5602c 100644 --- a/meta/recipes-devtools/git/git_1.7.5.1.bb +++ b/meta/recipes-devtools/git/git_1.7.5.1.bb @@ -1,6 +1,6 @@ require git.inc -PR = "r1" +PR = "r2" EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ -- cgit v1.2.3-54-g00ecf