From 6bf83a0928013f501dbfbd7ff094b317f39f8fbb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 13 Oct 2005 13:25:42 +0000 Subject: 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. --- packages/git/files/Makefile.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages/git/files/Makefile.patch') 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) -- cgit v1.2.3