[oe-commits] org.oe.dev git: fix building of git 1.5.2.3

[woglinde2 commit]

git: fix building of git 1.5.2.3
* remove git.inc because 2 files are enough
* let git-native require git
* override RDEPENDS in git-native
* switch to autotools
* add files/autotools.patch so we can crosscompile
* adding expat and zlib to the DEPENDS

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: e95eb694622a72f1148755a4193e80ac7f17229c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e95eb694622a72f1148755a4193e80ac7f17229c
Files:
1
packages/git/git.inc
packages/git/files
packages/git/files/autotools.patch
packages/git/git-native_1.5.2.3.bb
packages/git/git_1.5.2.3.bb
Diffs:

#
# mt diff -r4611a998739efc1fd1e5aed5104fe0bd389f892b -re95eb694622a72f1148755a4193e80ac7f17229c
#
# 
# 
# delete "packages/git/git.inc"
# 
# add_dir "packages/git/files"
# 
# add_file "packages/git/files/autotools.patch"
#  content [0aaccaaab7aa347c3ae8c40f7c34d8bd5909ba5c]
# 
# patch "packages/git/git-native_1.5.2.3.bb"
#  from [ae97a8c5233c3cb4903b5883f147dd80212a0056]
#    to [afff12662b4951ee123057ef071550c57ef5eda1]
# 
# patch "packages/git/git_1.5.2.3.bb"
#  from [e5b37769b78c7e71527f016056aa656260a6d6af]
#    to [7b6e155a67ae3cfd55f5fde6a4768700fd814f25]
# 
============================================================
--- packages/git/files/autotools.patch	0aaccaaab7aa347c3ae8c40f7c34d8bd5909ba5c
+++ packages/git/files/autotools.patch	0aaccaaab7aa347c3ae8c40f7c34d8bd5909ba5c
@@ -0,0 +1,14 @@
+Index: git-1.5.2.3/configure.ac
+===================================================================
+--- git-1.5.2.3.orig/configure.ac	2007-07-02 10:11:39.000000000 +0200
++++ git-1.5.2.3/configure.ac	2007-08-03 22:14:10.000000000 +0200
+@@ -235,7 +235,8 @@
+ 		else if (strcmp(buf, "12345"))
+ 		  exit(2);]])],
+ 	[ac_cv_c_c99_format=yes],
+-	[ac_cv_c_c99_format=no])
++	[ac_cv_c_c99_format=no],
++	[ac_cv_c_c99_format=yes])
+ ])
+ if test $ac_cv_c_c99_format = no; then
+ 	NO_C99_FORMAT=YesPlease
============================================================
--- packages/git/git-native_1.5.2.3.bb	ae97a8c5233c3cb4903b5883f147dd80212a0056
+++ packages/git/git-native_1.5.2.3.bb	afff12662b4951ee123057ef071550c57ef5eda1
@@ -1,3 +1,6 @@
-require git.inc
+
 inherit native
+require git_${PV}.bb
+
+DEPENDS = "openssl-native curl-native zlib-native expat-native"
+RDEPENDS = ""
-DEPENDS = "openssl-native curl-native"
============================================================
--- packages/git/git_1.5.2.3.bb	e5b37769b78c7e71527f016056aa656260a6d6af
+++ packages/git/git_1.5.2.3.bb	7b6e155a67ae3cfd55f5fde6a4768700fd814f25
@@ -1,11 +1,26 @@
-require git.inc
-DEPENDS = "openssl curl"
+DESCRIPTION = "The git revision control system used by the Linux kernel developers"
+SECTION = "console/utils"
+LICENSE = "GPL"
+PR="r3"
+
+inherit autotools
+
+SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \
+	   file://autotools.patch;patch=1 \
+	  "
+
+S = "${WORKDIR}/git-${PV}"
+
+DEPENDS = "openssl curl zlib expat"
 RDEPENDS = "perl perl-module-file-path cpio findutils sed"
 
-PR="r2"
+EXTRA_OEMAKE = "NO_TCLTK=1 LDFLAGS=${LDFLAGS}"
 
 do_install() {
 	oe_runmake install DESTDIR="${D}" bindir="${bindir}" \
 		template_dir="${datadir}/git-core/templates" \
 		GIT_PYTHON_DIR="${datadir}/git-core/python"
 }
+
+FILES_${PN} += "${datadir}/git-core"
+