NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/git: bump version to 2.15.0

Browse Source 
To avoid the build error

grep.c:(.text+0xa02): undefined reference to `pcre_jit_exec'

we need to add NO_LIBPCRE1_JIT=1 according to
https://www.spinics.net/lists/git/msg314515.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2017-10-31 09:16:24 +01:00 committed by Peter Korsgaard
parent e41f4d239b
commit e8ba19ba60
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/git/git.hash
View File

@ -1,4 +1,4 @@
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
sha256 bce97e403bea34f50378e90ade10c12666b2382cc247551b63dc5604e03b2523 git-2.13.6.tar.xz sha256 107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a git-2.15.0.tar.xz
sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING
sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1

5
package/git/git.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
GIT_VERSION = 2.13.6 GIT_VERSION = 2.15.0
GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SOURCE = git-$(GIT_VERSION).tar.xz
GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
GIT_LICENSE = GPL-2.0, LGPL-2.1+ GIT_LICENSE = GPL-2.0, LGPL-2.1+
@ -22,6 +22,7 @@ endif
ifeq ($(BR2_PACKAGE_PCRE),y) ifeq ($(BR2_PACKAGE_PCRE),y)
GIT_DEPENDENCIES += pcre GIT_DEPENDENCIES += pcre
GIT_CONF_OPTS += --with-libpcre GIT_CONF_OPTS += --with-libpcre
GIT_MAKE_OPTS += NO_LIBPCRE1_JIT=1
else else
GIT_CONF_OPTS += --without-libpcre GIT_CONF_OPTS += --without-libpcre
endif endif
@ -58,7 +59,7 @@ GIT_CONF_OPTS += --without-tcltk
endif endif
ifeq ($(BR2_SYSTEM_ENABLE_NLS),) ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
GIT_MAKE_OPTS = NO_GETTEXT=1 GIT_MAKE_OPTS += NO_GETTEXT=1
endif endif
GIT_INSTALL_TARGET_OPTS = $(GIT_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install GIT_INSTALL_TARGET_OPTS = $(GIT_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install