From: Kazuhiro Ito <redacted>
Date: Sat, 26 Apr 2025 16:24:42 +0000 (+0900)
Subject: grep: fix that egrep and fgrep workaround doesn't work
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b635f8ab9ac7d0ce0e10e0a0604d000b07bb333e;p=openwrt-packages.git

grep: fix that egrep and fgrep workaround doesn't work

Commit 07b6eec21f57c3cb391b0daf89240b7632b2a49f doesn't work at least
now, because package.mk initializes the variables to the default
values.  You have to modify the variable after including package.mk.

Signed-off-by: Kazuhiro Ito <redacted>
---

diff --git a/utils/grep/Makefile b/utils/grep/Makefile
index f63d66b4c..8b35ca9cf 100644
--- a/utils/grep/Makefile
+++ b/utils/grep/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=grep
 PKG_VERSION:=3.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/grep
@@ -23,10 +23,10 @@ PKG_CPE_ID:=cpe:/a:gnu:grep
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-MAKE_FLAGS += SHELL="/bin/sh"
-
 include $(INCLUDE_DIR)/package.mk
 
+MAKE_FLAGS += SHELL="/bin/sh"
+
 define Package/grep
   SECTION:=utils
   CATEGORY:=Utilities