[openwrt/openwrt] tools/elfutils: organize gnulib import build stage

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/43be31982366a9604ca5a980dd356d4a72a6d379

commit 43be31982366a9604ca5a980dd356d4a72a6d379
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Fri Apr 5 04:42:14 2024 -0400

    tools/elfutils: organize gnulib import build stage
    
    Organize the Makefile lines involved in gnulib importing and its
    workarounds. It improves readability and keeps git history organized.
    
    Tested-by: Georgi Valkov <gvalkov at gmail.com> # MacOS
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
    Signed-off-by: Tony Ambardar <itugrok at yahoo.com>
---
 tools/elfutils/Makefile | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/tools/elfutils/Makefile b/tools/elfutils/Makefile
index f13bd8c944..c7d94d2a47 100644
--- a/tools/elfutils/Makefile
+++ b/tools/elfutils/Makefile
@@ -29,6 +29,24 @@ PKG_SUBDIRS := \
 	libdwfl \
 	libdw
 
+PKG_GNULIB_BASE:=libgnu
+
+PKG_GNULIB_ARGS = \
+	--dir=$(HOST_BUILD_DIR) \
+	--local-dir=$(STAGING_DIR_HOST)/share/gnulib \
+	--source-base=$(PKG_GNULIB_BASE) \
+	--libtool \
+	--import
+
+PKG_GNULIB_MODS = \
+	argp \
+	dirname \
+	fts \
+	obstack \
+	progname \
+	strchrnul \
+	tsearch
+
 include $(INCLUDE_DIR)/host-build.mk
 
 ifeq ($(HOST_OS),Darwin)
@@ -55,7 +73,7 @@ endif
 
 Hooks/HostConfigure/Pre := Host/Gnulib $(Hooks/HostConfigure/Pre)
 define Host/Gnulib
-	cd $(HOST_BUILD_DIR); $(STAGING_DIR_HOST)/bin/gnulib-tool --libtool --source-base=libgnu --import argp dirname fts obstack progname strchrnul tsearch;
+	$(STAGING_DIR_HOST)/bin/gnulib-tool $(PKG_GNULIB_ARGS) $(PKG_GNULIB_MODS);
 	ln -sf ../lib/eu-config.h $(HOST_BUILD_DIR)/libgnu/;
 endef