git: fix runtime issues

* fix config.mak.in to export LDFLAGS, now it
  compiles and runs in a sane way
* remove the OEMAKE_EXTRA hack for LDFLAGS
* bump PR

diff --git a/packages/git/files/autotools.patch b/packages/git/files/autotools.patch
index 7625a0d..0666118 100644 (file)
--- a/packages/git/files/autotools.patch
+++ b/packages/git/files/autotools.patch
@@ -1,7 +1,7 @@
 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
++++ git-1.5.2.3/configure.ac   2007-08-04 00:02:13.000000000 +0200
 @@ -235,7 +235,8 @@
                else if (strcmp(buf, "12345"))
                  exit(2);]])],
@@ -12,3 +12,15 @@ Index: git-1.5.2.3/configure.ac
  ])
  if test $ac_cv_c_c99_format = no; then
        NO_C99_FORMAT=YesPlease
+Index: git-1.5.2.3/config.mak.in
+===================================================================
+--- git-1.5.2.3.orig/config.mak.in     2007-07-02 10:11:39.000000000 +0200
++++ git-1.5.2.3/config.mak.in  2007-08-04 00:07:04.000000000 +0200
+@@ -3,6 +3,7 @@
+ 
+ CC = @CC@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ AR = @AR@
+ TAR = @TAR@
+ #INSTALL = @INSTALL@          # needs install-sh or install.sh in sources

diff --git a/packages/git/git_1.5.2.3.bb b/packages/git/git_1.5.2.3.bb
index f70d840..db43aa7 100644 (file)
--- a/packages/git/git_1.5.2.3.bb
+++ b/packages/git/git_1.5.2.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The git revision control system used by the Linux kernel developers"
 SECTION = "console/utils"
 LICENSE = "GPL"
-PR="r3"
+PR="r4"
 
 inherit autotools
 
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git-${PV}"
 DEPENDS = "openssl curl zlib expat"
 RDEPENDS = "perl perl-module-file-path cpio findutils sed"
 
-EXTRA_OEMAKE = "NO_TCLTK=1 LDFLAGS=${LDFLAGS}"
+EXTRA_OEMAKE = "NO_TCLTK=1"
 
 do_install() {
        oe_runmake install DESTDIR="${D}" bindir="${bindir}" \