grep branch, master, updated. v3.1-39-g7179b21

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  7179b21b0366062d55e411320ff347c436d05a8a (commit)
       via  532737abf5d47f22d8b249c899160f44ba2ff65e (commit)
       via  248fd337f461a2efbae4d98b90dc28e9f41712bb (commit)
      from  51dacfb6d444a00fc31d56774a6ec88e6455ebc6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=7179b21b0366062d55e411320ff347c436d05a8a


commit 7179b21b0366062d55e411320ff347c436d05a8a
Author: Barret Rhoden <address@hidden>
Date:   Fri Sep 28 14:33:53 2018 -0700

    maint: fix cross-compiling problem
    
    * cfg.mk (PATH): Omit if cross-compiling (Bug#32866).
    Copyright-paperwork-exempt: yes

diff --git a/cfg.mk b/cfg.mk
index 9af3a8c..0c7e787 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -17,7 +17,9 @@
 # Cause the tool(s) built by this package to be used also when running
 # commands via e.g., "make syntax-check".  Doing this a little sooner
 # would have avoided a grep infloop bug.
+ifeq ($(build_triplet), $(host_triplet))
 export PATH := $(builddir)/src$(PATH_SEPARATOR)$(PATH)
+endif
 
 # Used in maint.mk's web-manual rule
 manual_title = GNU Grep: Print lines matching a pattern

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=532737abf5d47f22d8b249c899160f44ba2ff65e


commit 7179b21b0366062d55e411320ff347c436d05a8a
Author: Barret Rhoden <address@hidden>
Date:   Fri Sep 28 14:33:53 2018 -0700

    maint: fix cross-compiling problem
    
    * cfg.mk (PATH): Omit if cross-compiling (Bug#32866).
    Copyright-paperwork-exempt: yes

diff --git a/cfg.mk b/cfg.mk
index 9af3a8c..0c7e787 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -17,7 +17,9 @@
 # Cause the tool(s) built by this package to be used also when running
 # commands via e.g., "make syntax-check".  Doing this a little sooner
 # would have avoided a grep infloop bug.
+ifeq ($(build_triplet), $(host_triplet))
 export PATH := $(builddir)/src$(PATH_SEPARATOR)$(PATH)
+endif
 
 # Used in maint.mk's web-manual rule
 manual_title = GNU Grep: Print lines matching a pattern

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=248fd337f461a2efbae4d98b90dc28e9f41712bb


commit 7179b21b0366062d55e411320ff347c436d05a8a
Author: Barret Rhoden <address@hidden>
Date:   Fri Sep 28 14:33:53 2018 -0700

    maint: fix cross-compiling problem
    
    * cfg.mk (PATH): Omit if cross-compiling (Bug#32866).
    Copyright-paperwork-exempt: yes

diff --git a/cfg.mk b/cfg.mk
index 9af3a8c..0c7e787 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -17,7 +17,9 @@
 # Cause the tool(s) built by this package to be used also when running
 # commands via e.g., "make syntax-check".  Doing this a little sooner
 # would have avoided a grep infloop bug.
+ifeq ($(build_triplet), $(host_triplet))
 export PATH := $(builddir)/src$(PATH_SEPARATOR)$(PATH)
+endif
 
 # Used in maint.mk's web-manual rule
 manual_title = GNU Grep: Print lines matching a pattern

-----------------------------------------------------------------------

Summary of changes:
 cfg.mk     | 2 ++
 gnulib     | 2 +-
 src/grep.c | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep