summaryrefslogtreecommitdiff
path: root/packages/git
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-10-13 13:25:42 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-10-13 13:25:42 +0000
commit6bf83a0928013f501dbfbd7ff094b317f39f8fbb (patch)
treed0f06459e8835e18701e02863ae9ed4d02381d8d /packages/git
parentc685e77c0ebf78beeb61d9d52b3e23cdff659430 (diff)
linux-oz-2.6: Rearrange stable patches to reflect order in mainline. Add extra collie scoop fix. Seperate corgi include fix so mainline c7x0 compiles. Update hx2750 base patch for recent mmc changes.
Diffstat (limited to 'packages/git')
-rw-r--r--packages/git/files/Makefile.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/packages/git/files/Makefile.patch b/packages/git/files/Makefile.patch
index 0a82649db9..e360ae917d 100644
--- a/packages/git/files/Makefile.patch
+++ b/packages/git/files/Makefile.patch
@@ -1,13 +1,13 @@
-Index: git-snapshot-20050912/Makefile
+Index: git-snapshot-20051008/Makefile
===================================================================
---- git-snapshot-20050912.orig/Makefile 2005-09-11 03:46:53.000000000 +0100
-+++ git-snapshot-20050912/Makefile 2005-09-12 12:18:38.000000000 +0100
-@@ -239,7 +240,7 @@
+--- git-snapshot-20051008.orig/Makefile 2005-10-06 00:57:23.000000000 +0100
++++ git-snapshot-20051008/Makefile 2005-10-08 22:03:50.000000000 +0100
+@@ -332,7 +332,7 @@
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
- git-%: %.o $(LIB_FILE)
+ git-%$X: %.o $(LIB_FILE)
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
- git-mailinfo : SIMPLE_LIB += $(LIB_4_ICONV)
+ git-mailinfo$X : SIMPLE_LIB += $(LIB_4_ICONV)
$(SIMPLE_PROGRAMS) : $(LIB_FILE)