[Buildroot] [PATCH v2 1/2] package/git: bump version to 2.15.0

[Buildroot] [PATCH v2 1/2] package/git: bump version to 2.15.0

[Bernd Kuhls]

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>
---
v2: no changes

 package/git/git.hash | 2 +-
 package/git/git.mk   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package/git/git.hash b/package/git/git.hash
index d65296f17a..79a386eb72 100644
--- a/package/git/git.hash
+++ b/package/git/git.hash
@@ -1,4 +1,4 @@
 # 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 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a  LGPL-2.1
diff --git a/package/git/git.mk b/package/git/git.mk
index 9f13f0f6aa..181e7421e2 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -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
-- 
2.11.0

[Buildroot] [PATCH 2/2] package/git: add optional support for pcre2

[Bernd Kuhls]

Renamed --with-libpcre to --with-libpcre1. Currently --with-libpcre
activates pcre1 support but this can change in the future to pcre2:
https://github.com/git/git/blob/df7fd961a9d9ba60840ffc0868d36cc3db2aec74/configure.ac#L258

Please note that we cannot use --with-/--without because it will lead
to an error reported by configure, for example

    --with-libpcre1 --without-libpcre2

will produce

configure: error: Only supply one of --with-libpcre1 or --with-libpcre2!

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: fixed bug when "--with-libpcre1 --without-libpcre2" is used

 package/git/git.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/git/git.mk b/package/git/git.mk
index 181e7421e2..6269dc570e 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -19,9 +19,12 @@ else
 GIT_CONF_OPTS += --without-openssl
 endif
 
-ifeq ($(BR2_PACKAGE_PCRE),y)
+ifeq ($(BR2_PACKAGE_PCRE2),y)
+GIT_DEPENDENCIES += pcre2
+GIT_CONF_OPTS += --with-libpcre2
+else ifeq ($(BR2_PACKAGE_PCRE),y)
 GIT_DEPENDENCIES += pcre
-GIT_CONF_OPTS += --with-libpcre
+GIT_CONF_OPTS += --with-libpcre1
 GIT_MAKE_OPTS += NO_LIBPCRE1_JIT=1
 else
 GIT_CONF_OPTS += --without-libpcre
-- 
2.11.0

[Buildroot] [PATCH 2/2] package/git: add optional support for pcre2

[Thomas Petazzoni]

Hello,

On Tue, 31 Oct 2017 19:36:57 +0100, Bernd Kuhls wrote:
> Renamed --with-libpcre to --with-libpcre1. Currently --with-libpcre
> activates pcre1 support but this can change in the future to pcre2:
> https://github.com/git/git/blob/df7fd961a9d9ba60840ffc0868d36cc3db2aec74/configure.ac#L258
> 
> Please note that we cannot use --with-/--without because it will lead
> to an error reported by configure, for example
> 
>     --with-libpcre1 --without-libpcre2
> 
> will produce
> 
> configure: error: Only supply one of --with-libpcre1 or --with-libpcre2!
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: fixed bug when "--with-libpcre1 --without-libpcre2" is used

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 2/2] package/git: add optional support for pcre2

[Bernd Kuhls]

Bernd Kuhls <bernd.kuhls@t-online.de> wrote in 
news:20171031081625.13343-2-bernd.kuhls at t-online.de:

> Renamed --with-libpcre to --with-libpcre1. Currently --with-libpcre
> activates pcre1 support but this can change in the future to pcre2:
> https://github.com/git/git/blob/df7fd961a9d9ba60840ffc0868d36cc3db2aec74/co
nfigure.ac#L258

Hi,

please ignore patch 2/2 of this series, it needs modifications.

Regards, Bernd

[Buildroot] [PATCH 2/2] package/git: add optional support for pcre2

[Bernd Kuhls]

Renamed --with-libpcre to --with-libpcre1. Currently --with-libpcre
activates pcre1 support but this can change in the future to pcre2:
https://github.com/git/git/blob/df7fd961a9d9ba60840ffc0868d36cc3db2aec74/configure.ac#L258

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/git/git.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/git/git.mk b/package/git/git.mk
index 181e7421e2..c797e5fcc6 100644
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -19,12 +19,15 @@ else
 GIT_CONF_OPTS += --without-openssl
 endif
 
-ifeq ($(BR2_PACKAGE_PCRE),y)
+ifeq ($(BR2_PACKAGE_PCRE2),y)
+GIT_DEPENDENCIES += pcre2
+GIT_CONF_OPTS += --without-libpcre1 --with-libpcre2
+else ifeq ($(BR2_PACKAGE_PCRE),y)
 GIT_DEPENDENCIES += pcre
-GIT_CONF_OPTS += --with-libpcre
+GIT_CONF_OPTS += --with-libpcre1 --without-libpcre2
 GIT_MAKE_OPTS += NO_LIBPCRE1_JIT=1
 else
-GIT_CONF_OPTS += --without-libpcre
+GIT_CONF_OPTS += --without-libpcre1 --without-libpcre2
 endif
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
-- 
2.11.0