diff --git a/git/build.sh b/git/build.sh index 87ca7b0..819c1ce 100755 --- a/git/build.sh +++ b/git/build.sh @@ -6,12 +6,13 @@ ########################################################### # Check the following 4 variables before running the script topdir=git -version=2.4.5 +version=2.6.4 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.6.3-stdint_h.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -36,18 +37,18 @@ SHELL_PATH=$prefix/bin/bash ICONVDIR=$prefix SANE_TOOL_PATH=/usr/tgcware/gnu:/usr/xpg6/bin:/usr/xpg4/bin NO_INSTALL_HARDLINKS=YesPlease -BASIC_CFLAGS += -I/usr/tgcware/include -BASIC_LDFLAGS += -L/usr/tgcware/lib -Wl,-R,/usr/tgcware/lib -NEEDS_LIBICONV = YesPlease -NO_PYTHON = YesPlease -INSTALL = /usr/tgcware/bin/ginstall -TAR = /usr/tgcware/bin/gtar +BASIC_CFLAGS+=-I/usr/tgcware/include +BASIC_LDFLAGS+=-L/usr/tgcware/lib -Wl,-R,/usr/tgcware/lib +NEEDS_LIBICONV=YesPlease +NO_PYTHON=YesPlease +INSTALL=/usr/tgcware/bin/ginstall +TAR=/usr/tgcware/bin/gtar prefix=$prefix -NEEDS_RESOLV = YesPlease +NEEDS_RESOLV=YesPlease # missing PTHREAD_MUTEX_RECURSIVE with posix95 pthreads -NO_PTHREADS = YesPlease +NO_PTHREADS=YesPlease # It takes forever to run SVN tests -NO_SVN_TESTS = YesPlease +NO_SVN_TESTS=YesPlease EOF } diff --git a/git/meta/ChangeLog b/git/meta/ChangeLog index 65d49e5..b9cf8ae 100644 --- a/git/meta/ChangeLog +++ b/git/meta/ChangeLog @@ -1,5 +1,11 @@ CHANGELOG --------- +* Sat Dec 12 2015 Tom G. Christensen - 2.6.4-1 +- Update to 2.6.4 + +* Wed Nov 11 2015 Tom G. Christensen - 2.6.3-1 +- Update to 2.6.3 + * Wed Jul 01 2015 Tom G. Christensen - 2.4.5-1 - Update to 2.4.5 diff --git a/git/src/git-2.6.3-stdint_h.patch b/git/src/git-2.6.3-stdint_h.patch new file mode 100644 index 0000000..44ff964 --- /dev/null +++ b/git/src/git-2.6.3-stdint_h.patch @@ -0,0 +1,11 @@ +--- git-2.6.3/compat/regex/regcomp.c.no_stdint-h 2015-11-05 22:31:55.000000000 +0100 ++++ git-2.6.3/compat/regex/regcomp.c 2015-11-11 18:24:26.206399000 +0100 +@@ -18,7 +18,7 @@ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. */ + +-#include ++#include + + static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern, + size_t length, reg_syntax_t syntax);