Solaris/dbpware-for-solaris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git: update to 2.1.2

Browse Source
This commit is contained in:
Tom G. Christensen 2014-10-15 16:21:34 +02:00
parent 6a76fcb5e4
commit 12e2c4728d
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git/build.sh
View File

@ -6,12 +6,13 @@
########################################################### ###########################################################
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=git topdir=git
version=2.1.1 version=2.1.2
pkgver=1 pkgver=1
source[0]=https://www.kernel.org/pub/software/scm/git/$topdir-$version.tar.gz 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 source[1]=https://www.kernel.org/pub/software/scm/git/$topdir-manpages-$version.tar.gz
# If there are no patches, simply comment this # If there are no patches, simply comment this
patch[0]=git-1.8.1.5-inet_addrstrlen.patch patch[0]=git-1.8.1.5-inet_addrstrlen.patch
patch[1]=git-2.1.2-fix-no-pthreads.patch
# Source function library # Source function library
. ${BUILDPKG_SCRIPTS}/buildpkg.functions . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@ -32,6 +33,7 @@ prep()
cat << EOF > config.mak cat << EOF > config.mak
CC=gcc CC=gcc
PERL_PATH=$prefix/bin/perl PERL_PATH=$prefix/bin/perl
SHELL_PATH=$prefix/bin/bash
ICONVDIR=$prefix ICONVDIR=$prefix
SANE_TOOL_PATH=/usr/tgcware/gnu:/usr/xpg6/bin:/usr/xpg4/bin SANE_TOOL_PATH=/usr/tgcware/gnu:/usr/xpg6/bin:/usr/xpg4/bin
NO_INSTALL_HARDLINKS=YesPlease NO_INSTALL_HARDLINKS=YesPlease

3
git/meta/ChangeLog
View File

@ -1,5 +1,8 @@
CHANGELOG 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 * Sat Sep 27 2014 Tom G. Christensen <swpkg@jupiterrise.com> - 2.1.1-1
- Update to 2.1.1 - Update to 2.1.1

12
git/src/git-2.1.2-fix-no-pthreads.patch Normal file
View 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