Changeset 32733


Ignore:
Timestamp:
2012-07-15T16:55:24+02:00 (6 years ago)
Author:
luka
Message:

[packages] git: update to 1.7.11.2

Location:
packages/net/git
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/git/Makefile

    r32483 r32733  
    99 
    1010PKG_NAME:=git 
    11 PKG_VERSION:=1.7.11 
     11PKG_VERSION:=1.7.11.2 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=http://git-core.googlecode.com/files/ 
    16 PKG_MD5SUM:=0beee35ec7d11756f51ca1d3ec5c0e16 
     16PKG_MD5SUM:=91e01a22032f5d0ca2941ae7fd49d587 
    1717 
    1818PKG_INSTALL:=1 
  • packages/net/git/patches/100-convert_builtin.patch

    r32483 r32733  
    2525--- a/builtin.h 
    2626+++ b/builtin.h 
    27 @@ -151,5 +151,11 @@ extern int cmd_verify_pack(int argc, con 
     27@@ -153,5 +153,11 @@ extern int cmd_verify_pack(int argc, con 
    2828 extern int cmd_show_ref(int argc, const char **argv, const char *prefix); 
    2929 extern int cmd_pack_refs(int argc, const char **argv, const char *prefix); 
     
    170170--- a/Makefile 
    171171+++ b/Makefile 
    172 @@ -464,15 +464,7 @@ EXTRA_PROGRAMS = 
     172@@ -467,15 +467,7 @@ EXTRA_PROGRAMS = 
    173173 # ... and all the rest that could be moved out of bindir to gitexecdir 
    174174 PROGRAMS += $(EXTRA_PROGRAMS) 
     
    187187 # Binary suffix, set to .exe for Windows builds 
    188188 X = 
    189 @@ -900,6 +892,12 @@ BUILTIN_OBJS += builtin/var.o 
     189@@ -903,6 +895,12 @@ BUILTIN_OBJS += builtin/var.o 
    190190 BUILTIN_OBJS += builtin/verify-pack.o 
    191191 BUILTIN_OBJS += builtin/verify-tag.o 
     
    200200 GITLIBS = $(LIB_FILE) $(XDIFF_LIB) 
    201201 EXTLIBS = 
    202 @@ -1498,7 +1496,7 @@ endif 
     202@@ -1502,7 +1500,7 @@ endif 
    203203 EXTLIBS += -lz 
    204204  
     
    209209                BASIC_CFLAGS += -I$(OPENSSLDIR)/include 
    210210                OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib) 
    211 @@ -2279,10 +2277,6 @@ endif 
     211@@ -2287,10 +2285,6 @@ endif 
    212212 git-%$X: %.o GIT-LDFLAGS $(GITLIBS) 
    213213        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) 
     
    220220        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ 
    221221                $(LIBS) $(CURL_LIBCURL) 
    222 @@ -2579,24 +2573,22 @@ endif 
     222@@ -2587,24 +2581,22 @@ endif 
    223223        bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ 
    224224        execdir=$$(cd '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' && pwd) && \ 
Note: See TracChangeset for help on using the changeset viewer.