mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-27 17:12:46 +00:00
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@gmail.com> # MacOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
This commit is contained in:
parent
b6f025b424
commit
7a4df7825e
@ -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
|
||||
|
@ -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 @@
|
||||
|
Loading…
Reference in New Issue
Block a user