git: update to 2.1.2
This commit is contained in:
parent
6a76fcb5e4
commit
12e2c4728d
@ -6,12 +6,13 @@
|
||||
###########################################################
|
||||
# Check the following 4 variables before running the script
|
||||
topdir=git
|
||||
version=2.1.1
|
||||
version=2.1.2
|
||||
pkgver=1
|
||||
source[0]=https://www.kernel.org/pub/software/scm/git/$topdir-$version.tar.gz
|
||||
source[1]=https://www.kernel.org/pub/software/scm/git/$topdir-manpages-$version.tar.gz
|
||||
# If there are no patches, simply comment this
|
||||
patch[0]=git-1.8.1.5-inet_addrstrlen.patch
|
||||
patch[1]=git-2.1.2-fix-no-pthreads.patch
|
||||
|
||||
# Source function library
|
||||
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
|
||||
@ -32,6 +33,7 @@ prep()
|
||||
cat << EOF > config.mak
|
||||
CC=gcc
|
||||
PERL_PATH=$prefix/bin/perl
|
||||
SHELL_PATH=$prefix/bin/bash
|
||||
ICONVDIR=$prefix
|
||||
SANE_TOOL_PATH=/usr/tgcware/gnu:/usr/xpg6/bin:/usr/xpg4/bin
|
||||
NO_INSTALL_HARDLINKS=YesPlease
|
||||
|
@ -1,5 +1,8 @@
|
||||
CHANGELOG
|
||||
---------
|
||||
* Wed Oct 01 2014 Tom G. Christensen <swpkg@jupiterrise.com> - 2.1.2-1
|
||||
- Update to 2.1.2
|
||||
|
||||
* Sat Sep 27 2014 Tom G. Christensen <swpkg@jupiterrise.com> - 2.1.1-1
|
||||
- Update to 2.1.1
|
||||
|
||||
|
12
git/src/git-2.1.2-fix-no-pthreads.patch
Normal file
12
git/src/git-2.1.2-fix-no-pthreads.patch
Normal file
@ -0,0 +1,12 @@
|
||||
--- git-2.1.2/builtin/index-pack.c.pthreads 2014-09-30 21:00:40.000000000 +0200
|
||||
+++ git-2.1.2/builtin/index-pack.c 2014-10-15 13:29:54.353854000 +0200
|
||||
@@ -185,6 +185,9 @@
|
||||
#define deepest_delta_lock()
|
||||
#define deepest_delta_unlock()
|
||||
|
||||
+#define type_cas_lock()
|
||||
+#define type_cas_unlock()
|
||||
+
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user