summaryrefslogtreecommitdiff
path: root/package/git/patches/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/git/patches/patch-Makefile')
-rw-r--r--package/git/patches/patch-Makefile52
1 files changed, 26 insertions, 26 deletions
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
index 6f3b70e..dcfd4dd 100644
--- a/package/git/patches/patch-Makefile
+++ b/package/git/patches/patch-Makefile
@@ -1,26 +1,6 @@
---- git-1.6.5.5.orig/Makefile 2009-12-06 04:51:25.000000000 +0100
-+++ git-1.6.5.5/Makefile 2009-12-07 20:13:40.753866786 +0100
-@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
-
- # CFLAGS and LDFLAGS are for the users to override from the command line.
-
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
-+CFLAGS ?= -g -O2 -Wall
-+LDFLAGS ?=
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-@@ -241,7 +241,7 @@ bindir_relative = bin
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--gitexecdir = libexec/git-core
-+gitexecdir = sbin/git-core
- sharedir = $(prefix)/share
- template_dir = share/git-core/templates
- htmldir = share/doc/git-doc
-@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm
+--- 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
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -28,11 +8,31 @@
ln -s git$X $@ 2>/dev/null || \
cp git$X $@
-@@ -1749,7 +1748,6 @@ endif
+@@ -1894,7 +1893,6 @@ 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 $< $@
+
+@@ -2077,18 +2075,16 @@ 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 $(BUILT_INS); do \
+ 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; \
- done; } && \
+ 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; \
+ done && \