bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] git: update to 1.8.4.2

Browse Source 
Signed-off-by: Peter Wagner <tripolar@gmx.at>


git-svn-id: svn://svn.openwrt.org/openwrt/packages@38581 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
tripolar
2013-10-30 01:08:24 +00:00
parent 60d1879aad
commit 10b68894f3
3 changed files with 8 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/git/patches/100-convert_builtin.patch
View File

@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
@@ -540,16 +540,7 @@ EXTRA_PROGRAMS =
@@ -537,16 +537,7 @@ EXTRA_PROGRAMS =
# ... and all the rest that could be moved out of bindir to gitexecdir
PROGRAMS += $(EXTRA_PROGRAMS)
@ -18,7 +18,7 @@
# Binary suffix, set to .exe for Windows builds
X =
@@ -996,6 +987,12 @@ BUILTIN_OBJS += builtin/var.o
@@ -993,6 +984,12 @@ BUILTIN_OBJS += builtin/var.o
BUILTIN_OBJS += builtin/verify-pack.o
BUILTIN_OBJS += builtin/verify-tag.o
BUILTIN_OBJS += builtin/write-tree.o
@ -31,7 +31,7 @@
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
EXTLIBS =
@@ -1159,7 +1156,7 @@ endif
@@ -1156,7 +1153,7 @@ endif
EXTLIBS += -lz
ifndef NO_OPENSSL
@ -40,7 +40,7 @@
ifdef OPENSSLDIR
BASIC_CFLAGS += -I$(OPENSSLDIR)/include
OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib)
@@ -2048,10 +2045,6 @@ endif
@@ -2040,10 +2037,6 @@ endif
git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
@ -51,7 +51,7 @@
git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL)
@@ -2363,24 +2356,22 @@ endif
@@ -2355,24 +2348,22 @@ endif
bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \
{ test "$$bindir/" = "$$execdir/" || \
@ -239,7 +239,7 @@
const char **user_argv;
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -788,7 +788,7 @@ static int upload_pack_config(const char
@@ -747,7 +747,7 @@ static int upload_pack_config(const char
return parse_hide_refs_config(var, value, "uploadpack");
}