From 63ef788b509eb7a362ffc515c435e5bf42977027 Mon Sep 17 00:00:00 2001 From: luka Date: Mon, 23 May 2011 23:11:03 +0000 Subject: [PATCH] git package; cleaning up my mess git-svn-id: svn://svn.openwrt.org/openwrt/packages@26976 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/git/patches/100-fix-cross_compile.patch | 10 ---------- net/git/patches/110-convert_builtin.patch | 4 +--- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 net/git/patches/100-fix-cross_compile.patch diff --git a/net/git/patches/100-fix-cross_compile.patch b/net/git/patches/100-fix-cross_compile.patch deleted file mode 100644 index 7e18054e7..000000000 --- a/net/git/patches/100-fix-cross_compile.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -2188,7 +2188,6 @@ endif - - bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ - execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ -- ln -s ../../bin/git "$$execdir/git" && \ - { test "$$bindir/" = "$$execdir/" || \ - for p in $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ - $(RM) "$$execdir/$$p" && \ diff --git a/net/git/patches/110-convert_builtin.patch b/net/git/patches/110-convert_builtin.patch index 279179e5c..f2f233a3f 100644 --- a/net/git/patches/110-convert_builtin.patch +++ b/net/git/patches/110-convert_builtin.patch @@ -227,11 +227,9 @@ git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) -@@ -2192,23 +2188,22 @@ endif - +@@ -2193,22 +2189,20 @@ endif bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ -+ ln -s ../../bin/git "$$execdir/git" && \ { test "$$bindir/" = "$$execdir/" || \ - for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ + for p in $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ -- 2.11.0