[oe-commits] org.oe.dev git: fix runtime issues

[woglinde2 commit]

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

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

#
# mt diff -re95eb694622a72f1148755a4193e80ac7f17229c -r7954d4275dc1865e011407126cfd455d897e754d
#
# 
# 
# patch "packages/git/files/autotools.patch"
#  from [0aaccaaab7aa347c3ae8c40f7c34d8bd5909ba5c]
#    to [9ee002d92f3f136de9ea96322a94b0a3fbbb533a]
# 
# patch "packages/git/git_1.5.2.3.bb"
#  from [7b6e155a67ae3cfd55f5fde6a4768700fd814f25]
#    to [20343a1a801b95c0dc5d3fe24ff8e13373e3f597]
# 
============================================================
--- packages/git/files/autotools.patch	0aaccaaab7aa347c3ae8c40f7c34d8bd5909ba5c
+++ packages/git/files/autotools.patch	9ee002d92f3f136de9ea96322a94b0a3fbbb533a
@@ -1,7 +1,7 @@ Index: git-1.5.2.3/configure.ac
 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
============================================================
--- packages/git/git_1.5.2.3.bb	7b6e155a67ae3cfd55f5fde6a4768700fd814f25
+++ packages/git/git_1.5.2.3.bb	20343a1a801b95c0dc5d3fe24ff8e13373e3f597
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 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 @@ RDEPENDS = "perl perl-module-file-path c
 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}" \