ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
7822908bf3
openwrt/tools/elfutils/Makefile

101 lines
2.0 KiB
Makefile
Raw Normal View History

elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
# SPDX-License-Identifier: GPL-2.0-only
include $(TOPDIR)/rules.mk
PKG_NAME:=elfutils
tools/elfutils: update to 1.91 Release Notes: https://sourceware.org/pipermail/elfutils-devel/2024q1/006876.html Manually refresh: - 100-portability.patch Change: - replace libgen.h with gnulib "dirname" module for compilation errors: In file included from ./../libdw/libdwP.h:38, from eblobjnote.c:42: /usr/include/libgen.h:35:9: error: attempt to use poisoned "basename" 35 | #define basename __xpg_basename | ^ Tested-by: Georgi Valkov <gvalkov@gmail.com> # MacOS Co-Developed-by: Nick Hainke <vincent@systemli.org> Signed-off-by: Nick Hainke <vincent@systemli.org> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2024-03-04 05:04:36 +00:00
PKG_VERSION:=0.191
tools/elfutils: remove dirname In the 0.191 update dirname was used instead of <libgen.h> to fix the poisoned basename error: /usr/include/libgen.h:35:9: error: attempt to use poisoned "basename" 35 | #define basename __xpg_basename However, doing this has lead to libelf.a pulling in xmalloc, xstrdup and friends and statically linking them thus leading to a symbol name conflict with FRR host build and anything else that links against libelf and uses xmalloc and friends. Well, it turns out that upstream has added a helper[1] for basename so it can compile with musl 1.2.5 which dropped the basename declaration, but it also means that we must NOT include <libgen.h> and that poisoned error is intentional and added to prevent duplicate basename definitions. This also means that for macOS we dont need to do any additional header inclusions as the new helper takes care of basename. So, to fix the symbol conflict we can simply drop the <dirname.h> inclusion and build from elfutils. Tested on Fedora 40 as well as macOS 14.4.1. [1] https://sourceware.org/git/?p=elfutils.git;a=commit;h=a2194f6b305bf0d0b9dd49dccd0a5c21994c8eea Fixes: #24030 Fixes: b6f025b42429 ("tools/elfutils: update to 1.91") Link: https://github.com/openwrt/openwrt/pull/15337 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-04-30 09:08:46 +00:00
PKG_RELEASE:=2
elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION)
tools/elfutils: update to 1.91 Release Notes: https://sourceware.org/pipermail/elfutils-devel/2024q1/006876.html Manually refresh: - 100-portability.patch Change: - replace libgen.h with gnulib "dirname" module for compilation errors: In file included from ./../libdw/libdwP.h:38, from eblobjnote.c:42: /usr/include/libgen.h:35:9: error: attempt to use poisoned "basename" 35 | #define basename __xpg_basename | ^ Tested-by: Georgi Valkov <gvalkov@gmail.com> # MacOS Co-Developed-by: Nick Hainke <vincent@systemli.org> Signed-off-by: Nick Hainke <vincent@systemli.org> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2024-03-04 05:04:36 +00:00
PKG_HASH:=df76db71366d1d708365fc7a6c60ca48398f14367eb2b8954efc8897147ad871
elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3
PKG_CPE_ID:=cpe:/a:elfutils_project:elfutils
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
tools/elfutils: install a subset of the elfutils binaries Install binaries that are not common with binutils instead of none at all. This adds a negligible time to the build. Building shared libraries is disabled, so the AM_LDFLAGS can be reset without the rpath-link option which is unrecognized by clang. Some of the binaries depend on functions that are defined using a "strong alias" instead of a normal definition, but this is disabled by our patches in order to work on macOS, so use the identical function directly instead. Add fnmatch from gnulib with GNU extensions which is needed for usage of the FNM_EXTMATCH flag. Handle a "Wunused-const-variable" error with the same preprocessor conditional used to include the function that the variable is used in. Ref: f64bd4b6c ("tools/elfutils: only build required components") Tested-by: Georgi Valkov <gvalkov@gmail.com> # macOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/15368 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-05-01 19:21:38 +00:00
PKG_PROGRAMS:=elflint findtextrel elfcmp unstrip stack elfcompress elfclassify srcfiles
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>
2024-04-07 19:28:03 +00:00
PKG_SUBDIRS := \
libgnu \
config \
lib \
libelf \
libcpu \
backends \
libebl \
libdwelf \
libdwfl \
tools/elfutils: install a subset of the elfutils binaries Install binaries that are not common with binutils instead of none at all. This adds a negligible time to the build. Building shared libraries is disabled, so the AM_LDFLAGS can be reset without the rpath-link option which is unrecognized by clang. Some of the binaries depend on functions that are defined using a "strong alias" instead of a normal definition, but this is disabled by our patches in order to work on macOS, so use the identical function directly instead. Add fnmatch from gnulib with GNU extensions which is needed for usage of the FNM_EXTMATCH flag. Handle a "Wunused-const-variable" error with the same preprocessor conditional used to include the function that the variable is used in. Ref: f64bd4b6c ("tools/elfutils: only build required components") Tested-by: Georgi Valkov <gvalkov@gmail.com> # macOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/15368 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-05-01 19:21:38 +00:00
libdw \
src
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>
2024-04-07 19:28:03 +00:00
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@gmail.com> # MacOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2024-04-05 08:42:14 +00:00
PKG_GNULIB_BASE:=libgnu
PKG_GNULIB_ARGS = \
--dir=$(HOST_BUILD_DIR) \
--local-dir=$(STAGING_DIR_HOST)/share/gnulib \
--source-base=$(PKG_GNULIB_BASE) \
--libtool \
tools/elfutils: use locally declared static reallocarray() On macOS, stdlib.h in the standard include paths does not provide reallocarray() while both elfutils and gnulib do, however they are declared differently, leading to an error: ./system.h:101:1: error: static declaration of 'reallocarray' follows non-static declaration reallocarray (void *ptr, size_t nmemb, size_t size) A normal "configure && make" build cycle results in both declarations being enabled as a result of both elfutils and gnulib having completely separate configure checks where gnulib uses an internal placeholder symbol HAVE_REALLOCARRAY, and elfutils uses a standard autoconf macro HAVE_DECL_REALLOCARRAY. Fix this by excluding the import of the reallocarray module which causes gnulib checks in the configure stage to not even consider whether to declare reallocarray later on, so the decision is only between the standard include stdlib.h and the elfutils header. Tested-by: Georgi Valkov <gvalkov@gmail.com> # MacOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2024-04-08 03:28:51 +00:00
--avoid=reallocarray \
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@gmail.com> # MacOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2024-04-05 08:42:14 +00:00
--import
PKG_GNULIB_MODS = \
argp \
tools/elfutils: install a subset of the elfutils binaries Install binaries that are not common with binutils instead of none at all. This adds a negligible time to the build. Building shared libraries is disabled, so the AM_LDFLAGS can be reset without the rpath-link option which is unrecognized by clang. Some of the binaries depend on functions that are defined using a "strong alias" instead of a normal definition, but this is disabled by our patches in order to work on macOS, so use the identical function directly instead. Add fnmatch from gnulib with GNU extensions which is needed for usage of the FNM_EXTMATCH flag. Handle a "Wunused-const-variable" error with the same preprocessor conditional used to include the function that the variable is used in. Ref: f64bd4b6c ("tools/elfutils: only build required components") Tested-by: Georgi Valkov <gvalkov@gmail.com> # macOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/15368 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-05-01 19:21:38 +00:00
fnmatch-gnu \
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@gmail.com> # MacOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2024-04-05 08:42:14 +00:00
fts \
obstack \
progname \
strchrnul \
tsearch
elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
include $(INCLUDE_DIR)/host-build.mk
tools/elfutils: install a subset of the elfutils binaries Install binaries that are not common with binutils instead of none at all. This adds a negligible time to the build. Building shared libraries is disabled, so the AM_LDFLAGS can be reset without the rpath-link option which is unrecognized by clang. Some of the binaries depend on functions that are defined using a "strong alias" instead of a normal definition, but this is disabled by our patches in order to work on macOS, so use the identical function directly instead. Add fnmatch from gnulib with GNU extensions which is needed for usage of the FNM_EXTMATCH flag. Handle a "Wunused-const-variable" error with the same preprocessor conditional used to include the function that the variable is used in. Ref: f64bd4b6c ("tools/elfutils: only build required components") Tested-by: Georgi Valkov <gvalkov@gmail.com> # macOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Link: https://github.com/openwrt/openwrt/pull/15368 Signed-off-by: Robert Marko <robimarko@gmail.com>
2024-05-01 19:21:38 +00:00
HOST_MAKE_FLAGS += \
AM_LDFLAGS='$$$$(STACK_USAGE_NO_ERROR)' \
bin_PROGRAMS='$(PKG_PROGRAMS)' EXEEXT=
elfutils: fix build and enable on non-linux systems Use gnulib for compatibility Signed-off-by: Felix Fietkau <nbd@nbd.name>
2023-01-11 17:41:22 +00:00
ifeq ($(HOST_OS),Darwin)
HOST_CFLAGS += -I/opt/homebrew/include
endif
tools/elfutils: add -fPIC to fix linker errors (#13841) Resolves issues with building PIE binaries that link against libdw or libelf Signed-off-by: Felix Fietkau <nbd@nbd.name>
2023-11-01 16:44:43 +00:00
HOST_CFLAGS += -Wno-error -fPIC
elfutils: fix build and enable on non-linux systems Use gnulib for compatibility Signed-off-by: Felix Fietkau <nbd@nbd.name>
2023-01-11 17:41:22 +00:00
elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
HOST_CONFIGURE_ARGS += \
elfutils: fix build and enable on non-linux systems Use gnulib for compatibility Signed-off-by: Felix Fietkau <nbd@nbd.name>
2023-01-11 17:41:22 +00:00
--without-libintl-prefix \
--without-libiconv-prefix \
elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
--disable-debuginfod \
--disable-libdebuginfod \
--disable-nls \
--disable-shared \
elfutils: fix build and enable on non-linux systems Use gnulib for compatibility Signed-off-by: Felix Fietkau <nbd@nbd.name>
2023-01-11 17:41:22 +00:00
--enable-static \
elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
--without-lzma \
tools/elfutils: disable bzlib support It is not needed Signed-off-by: Felix Fietkau <nbd@nbd.name>
2023-11-01 17:37:45 +00:00
--without-bzlib \
elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
--without-zstd
elfutils: fix build and enable on non-linux systems Use gnulib for compatibility Signed-off-by: Felix Fietkau <nbd@nbd.name>
2023-01-11 17:41:22 +00:00
ifeq ($(HOST_OS),Darwin)
HOST_CONFIGURE_ARGS += --disable-symbol-versioning
endif
Hooks/HostConfigure/Pre := Host/Gnulib $(Hooks/HostConfigure/Pre)
define Host/Gnulib
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@gmail.com> # MacOS Signed-off-by: Michael Pratt <mcpratt@pm.me> Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2024-04-05 08:42:14 +00:00
$(STAGING_DIR_HOST)/bin/gnulib-tool $(PKG_GNULIB_ARGS) $(PKG_GNULIB_MODS);
elfutils: fix build and enable on non-linux systems Use gnulib for compatibility Signed-off-by: Felix Fietkau <nbd@nbd.name>
2023-01-11 17:41:22 +00:00
ln -sf ../lib/eu-config.h $(HOST_BUILD_DIR)/libgnu/;
endef
tools/elfutils: only build required components Building all of the components results in strip being installed in staging_dir/host/bin. This strip binary will take precedence over binutils strip that is installed in the toolchain directory. This will not work on host systems that do not have libdw installed, as we do not set HOST_LDFLAGS to override rpath to staging_dir/host/lib. However, rather than overriding rpath, we should just avoid using elfutils strip entirely. Override the SUBDIRS variable in the Makefile to only build and install the libraries we require for dwarves and frr. Fixes the following build failure in toolchain/gdb: strip: error while loading shared libraries: libdw.so.1: cannot open shared object file: No such file or directory Fixes: ad79b9271949 ("elfutils: move host build to tools") Reported-by: Dominick Grift <dominick.grift@defensec.nl> Reported-by: Lucian Cristian <lucian.cristian@gmail.com> Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-05-18 22:53:49 +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>
2024-04-07 19:28:03 +00:00
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
tools: add Host/Uninstall where possible This cleans staging_dir when calling tool/x/clean. Signed-off-by: Rosen Penev <rosenp@gmail.com>
2022-09-28 08:23:56 +00:00
define Host/Uninstall
-$(call Host/Compile/Default,uninstall)
endef
elfutils: move host build to tools The upcoming dwarves host package requires elfutils. As dependencies for tools must exist in tools, we need to move elfutils host build there. As there is at least one package that depends on this, and there is no proper way to create such dependency in the build system, build it unconditionally when not building on macOS. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2022-03-28 15:40:30 +00:00
$(eval $(call HostBuild))
Reference in New Issue Copy Permalink