diff options
Diffstat (limited to 'package/git')
| -rw-r--r-- | package/git/Makefile | 5 | ||||
| -rw-r--r-- | package/git/patches/patch-Makefile | 27 |
2 files changed, 22 insertions, 10 deletions
diff --git a/package/git/Makefile b/package/git/Makefile index db4082797..e02c9e669 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git PKG_VERSION:= 1.6.4.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= d7732d13a227d89f05122d230c5c8048 PKG_DESCR:= fast version control system PKG_SECTION:= misc @@ -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})) -TCFLAGS+= -DNO_NSEC -DNO_TCLTK -DNO_PERL +MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 +XAKE_FLAGS+= V=1 CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_c_c99_format=yes \ ac_cv_fread_reads_directories=no \ diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile index c0e2e28ce..172f4c882 100644 --- a/package/git/patches/patch-Makefile +++ b/package/git/patches/patch-Makefile @@ -1,24 +1,35 @@ ---- git-1.6.4.1.orig/Makefile 2009-08-22 06:54:01.000000000 +0200 -+++ git-1.6.4.1/Makefile 2009-08-23 12:11:07.755226105 +0200 -@@ -1345,7 +1345,6 @@ builtin-help.o: builtin-help.c common-cm +--- 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 + + # 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 +@@ -1345,8 +1345,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 $@ -@@ -1663,11 +1662,11 @@ endif + 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 || \ -+ ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \ 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 "$$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" |