summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/git/files/autotools.patch16
-rw-r--r--meta/recipes-devtools/git/git.inc3
-rw-r--r--meta/recipes-devtools/git/git_1.7.5.1.bb (renamed from meta/recipes-devtools/git/git_1.7.4.3.bb)6
3 files changed, 4 insertions, 21 deletions
diff --git a/meta/recipes-devtools/git/files/autotools.patch b/meta/recipes-devtools/git/files/autotools.patch
deleted file mode 100644
index cb21193f35..0000000000
--- a/meta/recipes-devtools/git/files/autotools.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1Upstream-Status:Inappropriate [configuration]
2
3Index: git-1.7.2.1/configure.ac
4===================================================================
5--- git-1.7.2.1.orig/configure.ac 2010-07-28 18:03:43.000000000 +0100
6+++ git-1.7.2.1/configure.ac 2010-08-13 14:54:29.181971250 +0100
7@@ -697,7 +697,8 @@
8 else if (strcmp(buf, "12345"))
9 return 2;]])],
10 [ac_cv_c_c99_format=yes],
11- [ac_cv_c_c99_format=no])
12+ [ac_cv_c_c99_format=no],
13+ [ac_cv_c_c99_format=yes])
14 ])
15 if test $ac_cv_c_c99_format = no; then
16 NO_C99_FORMAT=YesPlease
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 49292fad13..c884f9ccc1 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -3,8 +3,7 @@ SECTION = "console/utils"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4DEPENDS = "perl-native openssl curl zlib expat" 4DEPENDS = "perl-native 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 "
7 file://autotools.patch;patch=1"
8S = "${WORKDIR}/git-${PV}" 7S = "${WORKDIR}/git-${PV}"
9 8
10LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1" 9LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
diff --git a/meta/recipes-devtools/git/git_1.7.4.3.bb b/meta/recipes-devtools/git/git_1.7.5.1.bb
index 45ef61b5e5..bfdbf62954 100644
--- a/meta/recipes-devtools/git/git_1.7.4.3.bb
+++ b/meta/recipes-devtools/git/git_1.7.5.1.bb
@@ -1,10 +1,10 @@
1require git.inc 1require git.inc
2 2
3PR = "r2" 3PR = "r0"
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} \
7 " 7 "
8 8
9SRC_URI[md5sum] = "da6c8f4967393342a4397b955db72cb1" 9SRC_URI[md5sum] = "a49291116e3b0564e069ae989e4db6fb"
10SRC_URI[sha256sum] = "44b3ebc87d83b34468718fb6fa424420877e1f66c190389d693d090662a3556d" 10SRC_URI[sha256sum] = "a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c"