From e1f9c988080097de02762e53ad57a9376e68066c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:12 +0100 Subject: [PATCH] package/binutils: drop BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME Now that binutils 2.39 is gone, we can drop BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME, which was only used for binutils 2.39. This was a blind option, so Config.in.legacy handling is not needed. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/binutils/Config.in.host | 3 --- package/binutils/binutils.mk | 8 +------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index b6b1c56b5f..cb65f5f5e4 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -5,9 +5,6 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI default y depends on !BR2_microblaze -config BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME - bool - choice prompt "Binutils Version" default BR2_BINUTILS_VERSION_2_41_X if !BR2_arc diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 5209da0252..d98dd7b830 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -105,19 +105,13 @@ endif # our TARGET_CONFIGURE_ARGS are taken into consideration for those BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) -ifeq ($(BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME),) -define BINUTILS_INSTALL_STAGING_LIBSFRAME - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libsframe DESTDIR=$(STAGING_DIR) install -endef -endif - # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging define BINUTILS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install - $(BINUTILS_INSTALL_STAGING_LIBSFRAME) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libsframe DESTDIR=$(STAGING_DIR) install endef # If we don't want full binutils on target