Skip to content

Commit

Permalink
elfutils: move host build to tools
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
stintel authored and aiamadeus committed Aug 24, 2022
1 parent 9d22159 commit 4f70247
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 4 deletions.
4 changes: 0 additions & 4 deletions package/libs/elfutils/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,8 @@ PKG_INSTALL:=1
PKG_USE_MIPS16:=1
PKG_BUILD_DEPENDS:=!USE_GLIBC:argp-standalone

HOST_BUILD_DEPENDS:=argp-standalone/host musl-fts/host

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/host-build.mk

define Package/elfutils/Default
SECTION:=libs
Expand Down Expand Up @@ -114,7 +111,6 @@ define Package/libelf/install
endef

# these lines need to be ordered by dependency because of ABI versioning
$(eval $(call HostBuild))
$(eval $(call BuildPackage,libelf))
$(eval $(call BuildPackage,libdw))
$(eval $(call BuildPackage,libasm))
3 changes: 3 additions & 0 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ ifneq ($(HOST_OS),Linux)
endif
ifeq ($(HOST_OS),Darwin)
tools-y += bash
else
$(curdir)/elfutils/compile := $(curdir)/zlib/compile
tools-y += elfutils
endif

ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),)
Expand Down
32 changes: 32 additions & 0 deletions tools/elfutils/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# SPDX-License-Identifier: GPL-2.0-only

include $(TOPDIR)/rules.mk

PKG_NAME:=elfutils
PKG_VERSION:=0.186
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION)
PKG_HASH:=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177

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

HOST_BUILD_DEPENDS:=argp-standalone/host musl-fts/host

include $(INCLUDE_DIR)/host-build.mk

HOST_CONFIGURE_ARGS += \
--disable-debuginfod \
--disable-libdebuginfod \
--disable-nls \
--disable-shared \
--without-lzma \
--without-zstd

$(eval $(call HostBuild))

0 comments on commit 4f70247

Please sign in to comment.