diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 12:49:03 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 12:49:03 +0200 |
| commit | 181bf9bdca8065de5a592587bd86823e0b288ce0 (patch) | |
| tree | 61792ecc1051ba4f4d2d988aea3db7666562322f /package/git | |
| parent | f173d6ae31082439be71d9f5dcf6074ca6355520 (diff) | |
fix build on FreeBSD host
Diffstat (limited to 'package/git')
| -rw-r--r-- | package/git/Makefile | 7 | ||||
| -rw-r--r-- | package/git/patches/patch-Makefile | 52 |
2 files changed, 29 insertions, 30 deletions
diff --git a/package/git/Makefile b/package/git/Makefile index a3c9a8fd6..162cc13ab 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 1.7.1 +PKG_VERSION:= 1.7.2.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= d2fefae2b787a19601c09d89975ce5fb +PKG_MD5SUM:= 13fc44363df744a401552e73e5476351 PKG_DESCR:= fast version control system PKG_SECTION:= scm PKG_DEPENDS:= libopenssl libcurl libexpat libpthread @@ -18,8 +18,7 @@ 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 \ - NO_CROSS_DIRECTORY_HARDLINKS=1 \ +MAKE_ENV+= NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \ CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR} XAKE_FLAGS+= uname_S=Linux uname_O=GNU/Linux CONFIGURE_ENV+= ac_cv_c_c99_format=yes \ diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile index 6f3b70e98..dcfd4dd82 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 && \ |