Mercurial > mxe-octave
changeset 6431:e5ffad81f0ce
pass egrep to xz
* src/xz.mk: add (e)grep to input env vars
* Makefile.in: find (e)grep if can
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Mon, 26 Sep 2022 13:12:51 -0400 |
| parents | 8c787c429502 |
| children | 376abdc61336 |
| files | Makefile.in src/xz.mk |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Mon Sep 26 13:12:50 2022 -0400 +++ b/Makefile.in Mon Sep 26 13:12:51 2022 -0400 @@ -232,6 +232,7 @@ SHELL := @SHELL@ GREP ?= grep +EGREP ?= $(shell egrep --help >/dev/null 2>&1 && echo e)grep INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed
--- a/src/xz.mk Mon Sep 26 13:12:50 2022 -0400 +++ b/src/xz.mk Mon Sep 26 13:12:51 2022 -0400 @@ -17,7 +17,7 @@ endef define $(PKG)_BUILD - cd '$(1)' && autoreconf -fi && ./configure \ + cd '$(1)' && autoreconf -fi && EGREP=$(EGREP) ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ $(ENABLE_SHARED_OR_STATIC) \