diff options
| -rw-r--r-- | package/git/Makefile | 4 | ||||
| -rw-r--r-- | package/git/patches/patch-Makefile | 55 |
2 files changed, 39 insertions, 20 deletions
diff --git a/package/git/Makefile b/package/git/Makefile index 068ba07b2..b3aa2fdbe 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 1.7.2.1 +PKG_VERSION:= 1.7.3.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 13fc44363df744a401552e73e5476351 +PKG_MD5SUM:= 9b4bc13cd26cd8feb6b2dce8eefac145 PKG_DESCR:= fast version control system PKG_SECTION:= scm PKG_DEPENDS:= libopenssl libcurl libexpat libpthread diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile index dcfd4dd82..03923cc01 100644 --- a/package/git/patches/patch-Makefile +++ b/package/git/patches/patch-Makefile @@ -1,38 +1,57 @@ ---- git-1.7.2.1.orig/Makefile 2010-07-28 19:03:43.000000000 +0200 -+++ git-1.7.2.1/Makefile 2010-07-30 12:25:52.000000000 +0200 -@@ -1594,7 +1594,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP +--- git-1.7.3.2.orig/Makefile 2010-10-22 05:49:16.000000000 +0200 ++++ git-1.7.3.2/Makefile 2010-11-23 23:14:56.960685586 +0100 +@@ -1615,9 +1615,7 @@ builtin/help.s builtin/help.o: EXTRA_CPP $(BUILT_INS): git$X $(QUIET_BUILT_IN)$(RM) $@ && \ - ln git$X $@ 2>/dev/null || \ - ln -s git$X $@ 2>/dev/null || \ - cp git$X $@ +- ln -s git$X $@ 2>/dev/null || \ +- cp git$X $@ ++ ln -s git$X $@ 2>/dev/null -@@ -1894,7 +1893,6 @@ git-http-push$X: revision.o http.o http- + common-cmds.h: ./generate-cmdlist.sh command-list.txt + +@@ -1932,9 +1930,7 @@ git-http-push$X: revision.o http.o http- $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) $(QUIET_LNCP)$(RM) $@ && \ - ln $< $@ 2>/dev/null || \ - ln -s $< $@ 2>/dev/null || \ - cp $< $@ +- ln -s $< $@ 2>/dev/null || \ +- cp $< $@ ++ ln -s $< $@ 2>/dev/null -@@ -2077,18 +2075,16 @@ endif + $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS) + $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ +@@ -2123,29 +2119,21 @@ endif { test "$$bindir/" = "$$execdir/" || \ - { $(RM) "$$execdir/git$X" && \ - test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ -- ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ -+ ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ - cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \ + for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ + $(RM) "$$execdir/$$p" && \ +- test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ +- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ + cp "$$bindir/$$p" "$$execdir/$$p" || exit; \ + done; \ + } && \ + for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ + $(RM) "$$bindir/$$p" && \ +- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ +- ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ +- cp "$$bindir/git$X" "$$bindir/$$p" || exit; \ ++ ln -s "git$X" "$$bindir/$$p" 2>/dev/null || exit; \ + done && \ for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ - ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ - cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ +- ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ +- cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ ++ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || exit; \ done && \ remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \ for p in $$remote_curl_aliases; do \ $(RM) "$$execdir/$$p" && \ - ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ - ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ - cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \ +- ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ +- cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \ ++ ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || exit; \ done && \ + ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X" + |