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