summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-06-10 15:25:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-14 15:27:52 +0100
commit218bcd597d4ba7b0a51f8e09bd7bff5e610676e4 (patch)
treeeee257c3001d5e5349c5944937fda93643fa7154 /meta
parentdcfb6e4d2ab5df32f0f2408a1aafd6923018555f (diff)
downloadpoky-218bcd597d4ba7b0a51f8e09bd7bff5e610676e4.tar.gz
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 <dexuan.cui@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/git/git.inc6
-rw-r--r--meta/recipes-devtools/git/git_1.7.5.1.bb2
2 files changed, 4 insertions, 4 deletions
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 @@
1DESCRIPTION = "The git revision control system used by the Linux kernel developers" 1DESCRIPTION = "The git revision control system used by the Linux kernel developers"
2SECTION = "console/utils" 2SECTION = "console/utils"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4DEPENDS = "perl-native-runtime openssl curl zlib expat" 4DEPENDS = "openssl curl zlib expat"
5 5
6SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 " 6SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.bz2 "
7S = "${WORKDIR}/git-${PV}" 7S = "${WORKDIR}/git-${PV}"
8 8
9LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" 9LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
10 10
11EXTRA_OECONF = "--without-tcltk" 11EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl --without-tcltk"
12 12
13inherit autotools 13inherit autotools perlnative
14 14
15do_install () { 15do_install () {
16 oe_runmake install DESTDIR="${D}" bindir=${bindir} \ 16 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 @@
1require git.inc 1require git.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \ 5EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
6 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ 6 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \