Browse Source

update git to latest upstream version

Waldemar Brodkorb 15 years ago
parent
commit
aefd01b381
2 changed files with 20 additions and 16 deletions
  1. 4 3
      package/git/Makefile
  2. 16 13
      package/git/patches/patch-Makefile

+ 4 - 3
package/git/Makefile

@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.6.5.4
+PKG_VERSION:=		1.6.5.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0b3062212857b5778113aa2d4dfd65e2
+PKG_MD5SUM:=		50fb736021ef89916af622cb4772bbea
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		openssl curl
@@ -17,7 +17,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \
+			NO_CROSS_DIRECTORY_HARDLINKS=1
 XAKE_FLAGS+=		V=1
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \

+ 16 - 13
package/git/patches/patch-Makefile

@@ -1,6 +1,6 @@
---- git-1.6.4.2.orig/Makefile	2009-08-29 23:58:52.000000000 +0200
-+++ git-1.6.4.2/Makefile	2009-10-01 15:36:20.567802008 +0200
-@@ -212,8 +212,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
+--- 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.
  
@@ -11,25 +11,28 @@
  ALL_CFLAGS = $(CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
-@@ -1345,8 +1345,6 @@ builtin-help.o: builtin-help.c common-cm
+@@ -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
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
 -	ln git$X $@ 2>/dev/null || \
--	ln -s git$X $@ 2>/dev/null || \
+ 	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
- common-cmds.h: ./generate-cmdlist.sh command-list.txt
-@@ -1663,12 +1661,9 @@ endif
- 	{ test "$$bindir/" = "$$execdir/" || \
- 		{ $(RM) "$$execdir/git$X" && \
- 		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
--		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
+@@ -1749,7 +1748,6 @@ endif
  		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
  	{ 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 || \
+ 		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
  	  done; } && \
- 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"