[Buildroot] [PATCH 1/3] grep: bump to version 3.1

[Buildroot] [PATCH 1/3] grep: bump to version 3.1

[Baruch Siach]

Add license file hash.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/grep/grep.hash | 4 +++-
 package/grep/grep.mk   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/grep/grep.hash b/package/grep/grep.hash
index 77420ad69483..10a5e320e410 100644
--- a/package/grep/grep.hash
+++ b/package/grep/grep.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking signature
-sha256 e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5  grep-3.0.tar.xz
+# http://ftp.gnu.org/gnu/grep/grep-3.1.tar.xz.sig
+sha256 db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e  grep-3.1.tar.xz
+sha256 ca372a7d92560b1fa9f6d832b440e8bcd62d9adfa8870c98287deab66d98310e  COPYING
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index a2ef4222698d..cfbf2ec7b537 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GREP_VERSION = 3.0
+GREP_VERSION = 3.1
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_LICENSE = GPL-3.0+
-- 
2.13.2

[Buildroot] [PATCH 2/3] grep: standardise pcre optional dependency

[Baruch Siach]

Add the 'disable' config option in the 'else' clause of the optional
dependency as is the common pattern.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/grep/grep.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index cfbf2ec7b537..06d84ed5b96f 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -9,8 +9,7 @@ GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_LICENSE = GPL-3.0+
 GREP_LICENSE_FILES = COPYING
-GREP_CONF_OPTS = --disable-perl-regexp \
-	$(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
+GREP_CONF_OPTS = $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
 GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 # link with iconv if enabled
@@ -23,6 +22,8 @@ endif
 ifeq ($(BR2_PACKAGE_PCRE),y)
 GREP_CONF_OPTS += --enable-perl-regexp
 GREP_DEPENDENCIES += pcre
+else
+GREP_CONF_OPTS += --disable-perl-regexp
 endif
 
 # Full grep preferred over busybox grep
-- 
2.13.2

[Buildroot] [PATCH 3/3] grep: remove musl build workaround

[Baruch Siach]

Commit de903755d79e (grep: fix build failure for musl) added
--with-included-regex to configure options in musl builds. The commit log
mentions build failure because grep configure doesn't detect the missing libc
regex support. Unfortunately, the commit log adds no details on said build
failure, or any autobuilder reference. The autobuilder didn't record
any grep build failure for version 2.20 that was current at the time.

Build with musl succeeds nowadays, so remove the workaround.

Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/grep/grep.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index 06d84ed5b96f..6e44a189f0ab 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -9,7 +9,6 @@ GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
 GREP_LICENSE = GPL-3.0+
 GREP_LICENSE_FILES = COPYING
-GREP_CONF_OPTS = $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
 GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 # link with iconv if enabled
-- 
2.13.2

[Buildroot] [PATCH 1/3] grep: bump to version 3.1

[Thomas Petazzoni]

Hello,

On Mon, 24 Jul 2017 06:59:52 +0300, Baruch Siach wrote:
> Add license file hash.
> 
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/grep/grep.hash | 4 +++-
>  package/grep/grep.mk   | 2 +-
>  2 files changed, 4 insertions(+), 2 deletions(-)

Series applied, thanks!

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

[Buildroot] [PATCH 3/3] grep: remove musl build workaround

[Thomas Petazzoni]

Hello,

On Mon, 24 Jul 2017 06:59:54 +0300, Baruch Siach wrote:
> Commit de903755d79e (grep: fix build failure for musl) added
> --with-included-regex to configure options in musl builds. The commit log
> mentions build failure because grep configure doesn't detect the missing libc
> regex support. Unfortunately, the commit log adds no details on said build
> failure, or any autobuilder reference. The autobuilder didn't record
> any grep build failure for version 2.20 that was current at the time.
> 
> Build with musl succeeds nowadays, so remove the workaround.

I tried to research a bit for this one, but couldn't find anything.
Even grep 2.20 had m4/regex.m4 that was checking if there is a working
regex implementation in the C library, and if not falls back on using
the gnulib provided version. And this AC_RUN_IFELSE() test properly
defaults to assuming that the libc doesn't provide a regex
implementation when cross-compiling (because AC_RUN_IFELSE tests can't
be executed when cross compiling).

So I'm a bit puzzled why this was needed in the first place. I've
applied, and we'll see if anyone complains.

Thanks!

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