summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-30 16:52:28 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-30 16:52:28 +0000
commit8e8b85df268143f19cd3a72e7275aafac582fc6b (patch)
tree0f34c825c04805f931caf64c8e8bc1cda5cc75ba /meta/packages
parentb6691acf0dacf6791e38bcb42f9303d27fa0a0e8 (diff)
downloadpoky-8e8b85df268143f19cd3a72e7275aafac582fc6b.tar.gz
git-native: Sync minor tweaks from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3286 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/git/files/autotools.patch26
-rw-r--r--meta/packages/git/git-native_1.5.3.bb3
-rw-r--r--meta/packages/git/git.inc8
3 files changed, 34 insertions, 3 deletions
diff --git a/meta/packages/git/files/autotools.patch b/meta/packages/git/files/autotools.patch
new file mode 100644
index 0000000000..0666118cde
--- /dev/null
+++ b/meta/packages/git/files/autotools.patch
@@ -0,0 +1,26 @@
1Index: git-1.5.2.3/configure.ac
2===================================================================
3--- git-1.5.2.3.orig/configure.ac 2007-07-02 10:11:39.000000000 +0200
4+++ git-1.5.2.3/configure.ac 2007-08-04 00:02:13.000000000 +0200
5@@ -235,7 +235,8 @@
6 else if (strcmp(buf, "12345"))
7 exit(2);]])],
8 [ac_cv_c_c99_format=yes],
9- [ac_cv_c_c99_format=no])
10+ [ac_cv_c_c99_format=no],
11+ [ac_cv_c_c99_format=yes])
12 ])
13 if test $ac_cv_c_c99_format = no; then
14 NO_C99_FORMAT=YesPlease
15Index: git-1.5.2.3/config.mak.in
16===================================================================
17--- git-1.5.2.3.orig/config.mak.in 2007-07-02 10:11:39.000000000 +0200
18+++ git-1.5.2.3/config.mak.in 2007-08-04 00:07:04.000000000 +0200
19@@ -3,6 +3,7 @@
20
21 CC = @CC@
22 CFLAGS = @CFLAGS@
23+LDFLAGS = @LDFLAGS@
24 AR = @AR@
25 TAR = @TAR@
26 #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources
diff --git a/meta/packages/git/git-native_1.5.3.bb b/meta/packages/git/git-native_1.5.3.bb
index f91fd03ab1..935c773c1c 100644
--- a/meta/packages/git/git-native_1.5.3.bb
+++ b/meta/packages/git/git-native_1.5.3.bb
@@ -1,3 +1,4 @@
1require git.inc 1require git.inc
2inherit native 2inherit native
3DEPENDS = "openssl-native curl-native" 3DEPENDS = "openssl-native curl-native zlib-native expat-native"
4PR = "r1"
diff --git a/meta/packages/git/git.inc b/meta/packages/git/git.inc
index 384dfaaeec..7115d44b35 100644
--- a/meta/packages/git/git.inc
+++ b/meta/packages/git/git.inc
@@ -2,9 +2,14 @@ DESCRIPTION = "The git revision control system used by the Linux kernel develope
2SECTION = "console/utils" 2SECTION = "console/utils"
3LICENSE = "GPL" 3LICENSE = "GPL"
4 4
5SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2" 5SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
6 file://autotools.patch;patch=1"
6S = "${WORKDIR}/git-${PV}" 7S = "${WORKDIR}/git-${PV}"
7 8
9EXTRA_OEMAKE = "NO_TCLTL=1"
10
11inherit autotools
12
8do_install () { 13do_install () {
9 oe_runmake install prefix=${D} bindir=${D}${bindir} \ 14 oe_runmake install prefix=${D} bindir=${D}${bindir} \
10 template_dir=${D}${datadir}/git-core/templates \ 15 template_dir=${D}${datadir}/git-core/templates \
@@ -12,4 +17,3 @@ do_install () {
12} 17}
13 18
14FILES_${PN} += "${datadir}/git-core" 19FILES_${PN} += "${datadir}/git-core"
15