|
@@ -4,7 +4,7 @@
|
|
#
|
|
#
|
|
################################################################################
|
|
################################################################################
|
|
|
|
|
|
-GIT_VERSION = 2.30.2
|
|
|
|
|
|
+GIT_VERSION = 2.31.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+
|
|
@@ -25,12 +25,8 @@ endif
|
|
ifeq ($(BR2_PACKAGE_PCRE2),y)
|
|
ifeq ($(BR2_PACKAGE_PCRE2),y)
|
|
GIT_DEPENDENCIES += pcre2
|
|
GIT_DEPENDENCIES += pcre2
|
|
GIT_CONF_OPTS += --with-libpcre2
|
|
GIT_CONF_OPTS += --with-libpcre2
|
|
-else ifeq ($(BR2_PACKAGE_PCRE),y)
|
|
|
|
-GIT_DEPENDENCIES += pcre
|
|
|
|
-GIT_CONF_OPTS += --with-libpcre1
|
|
|
|
-GIT_MAKE_OPTS += NO_LIBPCRE1_JIT=1
|
|
|
|
else
|
|
else
|
|
-GIT_CONF_OPTS += --without-libpcre
|
|
|
|
|
|
+GIT_CONF_OPTS += --without-libpcre2
|
|
endif
|
|
endif
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
|
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|