From eac927fadf07b94babbe9cc1b2b8111107c5fd1f Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Fri, 17 Apr 2026 23:47:11 +0300 Subject: [PATCH] toolchain: binutils: simplify patch management Take in account only first two version components to lookup patch directory. Hovewer, computed "BASE_VERSION" may be overridden (if necessary). This change should prevent further issues with binutils being unpatched, see commits adad973a9c34 and 525a1e94b343. Also drop obsolete "BIN_VERSION" variable (not used anywhere). Signed-off-by: Konstantin Demin Link: https://github.com/openwrt/openwrt/pull/21997 Signed-off-by: Nick Hainke --- toolchain/binutils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 70cf96e1f9..b2b0607a90 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=binutils PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION)) -BIN_VERSION:=$(PKG_VERSION) +BASE_VERSION:=$(subst $(space),.,$(wordlist 1,2,$(subst .,$(space),$(PKG_VERSION)))) PKG_SOURCE_URL:=@GNU/binutils/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -26,7 +26,7 @@ endif HOST_BUILD_PARALLEL:=1 -PATCH_DIR:=./patches/$(PKG_VERSION) +PATCH_DIR:=./patches/$(BASE_VERSION) include $(INCLUDE_DIR)/toolchain-build.mk