From 77d11357bc149509cb989e87f7440f73a37930a7 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sun, 2 Feb 2014 14:37:50 +0100 Subject: [PATCH] git: update to 1.8.5.3 --- git/build.sh | 6 ++-- git/meta/ChangeLog | 3 ++ git/meta/relnotes | 27 ------------------ git/src/git-1.7.2.3-symlinks.patch | 46 ------------------------------ 4 files changed, 7 insertions(+), 75 deletions(-) delete mode 100644 git/meta/relnotes delete mode 100644 git/src/git-1.7.2.3-symlinks.patch diff --git a/git/build.sh b/git/build.sh index d74aa3e..4de5fe9 100755 --- a/git/build.sh +++ b/git/build.sh @@ -6,7 +6,7 @@ ########################################################### # Check the following 4 variables before running the script topdir=git -version=1.8.4.3 +version=1.8.5.3 pkgver=1 source[0]=http://git-core.googlecode.com/files/$topdir-$version.tar.gz source[1]=http://git-core.googlecode.com/files/$topdir-manpages-$version.tar.gz @@ -29,7 +29,7 @@ prep() { generic_prep setdir source - cat < config.mak + cat << EOF > config.mak CC=gcc PERL_PATH=$prefix/bin/perl ICONVDIR=$prefix @@ -45,6 +45,8 @@ prefix=$prefix NEEDS_RESOLV = YesPlease # missing PTHREAD_MUTEX_RECURSIVE with posix95 pthreads NO_PTHREADS = YesPlease +# It takes forever to run SVN tests +NO_SVN_TESTS = YesPlease EOF } diff --git a/git/meta/ChangeLog b/git/meta/ChangeLog index 0a4def4..e76d9c8 100644 --- a/git/meta/ChangeLog +++ b/git/meta/ChangeLog @@ -1,5 +1,8 @@ CHANGELOG --------- +* Sun Feb 02 2014 Tom G. Christensen - 1.8.5.3-1 +- Update to 1.8.5.3 + * Sun Nov 17 2013 Tom G. Christensen - 1.8.4.3-1 - Update to 1.8.4.3 diff --git a/git/meta/relnotes b/git/meta/relnotes deleted file mode 100644 index bd83629..0000000 --- a/git/meta/relnotes +++ /dev/null @@ -1,27 +0,0 @@ -PACKAGE DETAILS ---------------- -Name: %%PKGNAME%% -Version: %%SOURCE_AND_VER%% -Vendor: %%VENDOR%% -Packager: %%PKGEDBY%% - -Source (sha1sum): -%%SOURCE_SHA1SUM%% - -BUILD DETAILS -------------- -Compiler: -%%COMPILER%% - -Environment: -%%ENVIRONMENT%% - -Configure: -%%CONFIGURE%% - -KNOWN DEPENDENCIES ------------------- -%%DEPENDENCIES%% - -ERRORS/MISCELLANEOUS --------------------- diff --git a/git/src/git-1.7.2.3-symlinks.patch b/git/src/git-1.7.2.3-symlinks.patch deleted file mode 100644 index a205061..0000000 --- a/git/src/git-1.7.2.3-symlinks.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- git-1.7.2.3/Makefile.symlinks 2010-09-03 23:05:21.000000000 +0200 -+++ git-1.7.2.3/Makefile 2010-09-07 12:15:43.500000000 +0200 -@@ -1594,7 +1594,6 @@ - - $(BUILT_INS): git$X - $(QUIET_BUILT_IN)$(RM) $@ && \ -- ln git$X $@ 2>/dev/null || \ - ln -s git$X $@ 2>/dev/null || \ - cp git$X $@ - -@@ -1895,7 +1894,6 @@ - - $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) - $(QUIET_LNCP)$(RM) $@ && \ -- ln $< $@ 2>/dev/null || \ - ln -s $< $@ 2>/dev/null || \ - cp $< $@ - -@@ -2079,26 +2077,23 @@ - for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ - $(RM) "$$execdir/$$p" && \ - test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ -- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ -+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ - cp "$$bindir/$$p" "$$execdir/$$p" || exit; \ - done; \ - } && \ - for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ - $(RM) "$$bindir/$$p" && \ -- ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ - ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ - cp "$$bindir/git$X" "$$bindir/$$p" || exit; \ - done && \ - 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 && \ - 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 && \