[openwrt/openwrt] tools/elfutils: override SUBDIRS variable of Makefile

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/7a4df7825eae83650c42ef9839f985f6fdc87b09

commit 7a4df7825eae83650c42ef9839f985f6fdc87b09
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Sun Apr 7 15:28:03 2024 -0400

    tools/elfutils: override SUBDIRS variable of Makefile
    
    Instead of editing the SUBDIRS variable with a patch, it can be overriden
    at the end of the command line when invoking Make.
    
    This tool has a series of recursive Makefiles in each subdirectory,
    therefore SUBDIRS is set to a pattern of Make functions so that the result
    is variable depending on the current subdirectory that Make is being
    invoked in.
    
    It's not necessary to have gnulib-cache.m4 in EXTRA_DIST since we don't
    need to re-import after packaging this in the SDK, so get rid of the
    entire patch hunk for ./Makefile.am
    
    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 ++++++++++++++++++++
 tools/elfutils/patches/100-portability.patch | 17 -----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/tools/elfutils/Makefile b/tools/elfutils/Makefile
index adf8770783..f13bd8c944 100644
--- a/tools/elfutils/Makefile
+++ b/tools/elfutils/Makefile
@@ -17,6 +17,18 @@ PKG_CPE_ID:=cpe:/a:elfutils_project:elfutils
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
+PKG_SUBDIRS := \
+	libgnu \
+	config \
+	lib \
+	libelf \
+	libcpu \
+	backends \
+	libebl \
+	libdwelf \
+	libdwfl \
+	libdw
+
 include $(INCLUDE_DIR)/host-build.mk
 
 ifeq ($(HOST_OS),Darwin)
@@ -47,6 +59,14 @@ define Host/Gnulib
 	ln -sf ../lib/eu-config.h $(HOST_BUILD_DIR)/libgnu/;
 endef
 
+define Host/Compile
+	$(call Host/Compile/Default,SUBDIRS='$$$$(wildcard $(PKG_SUBDIRS))')
+endef
+
+define Host/Install
+	$(call Host/Compile/Default,install SUBDIRS='$$$$(wildcard $(PKG_SUBDIRS))')
+endef
+
 define Host/Uninstall
 	-$(call Host/Compile/Default,uninstall)
 endef
diff --git a/tools/elfutils/patches/100-portability.patch b/tools/elfutils/patches/100-portability.patch
index 0a3dd63a85..91fff1ca78 100644
--- a/tools/elfutils/patches/100-portability.patch
+++ b/tools/elfutils/patches/100-portability.patch
@@ -89,23 +89,6 @@
  dnl The directories with content.
  
  dnl Documentation.
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,11 +26,11 @@ AM_MAKEFLAGS = --no-print-directory
- 
- pkginclude_HEADERS = version.h
- 
--SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl libdw \
--	  libasm debuginfod src po doc tests
-+SUBDIRS = libgnu config lib libelf libcpu backends libebl libdwelf libdwfl libdw
- 
- EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING SECURITY \
--	     COPYING COPYING-GPLV2 COPYING-LGPLV3
-+	     COPYING COPYING-GPLV2 COPYING-LGPLV3 \
-+		 m4/gnulib-cache.m4
- 
- # Make sure the test install uses lib64 when $LIB will yield lib64.
- # Make sure the test build uses the same compiler, which on e.g. ppc64
 --- a/libelf/elf_update.c
 +++ b/libelf/elf_update.c
 @@ -37,6 +37,33 @@