From eb0f8b6bfc0d9de5b16679f9c02b7867f25fc89e Mon Sep 17 00:00:00 2001 From: fda77 Date: Mon, 20 Feb 2023 20:57:59 +0100 Subject: [PATCH] downgrade patchelf-host - closes https://github.com/Freetz-NG/freetz-ng/issues/740 --- config/ui/toolchain.in | 8 +++++--- docs/CHANGELOG.md | 1 + make/host-tools/patchelf-host/patchelf-host.mk | 6 ++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config/ui/toolchain.in b/config/ui/toolchain.in index e2793c4315..b083a80d1b 100644 --- a/config/ui/toolchain.in +++ b/config/ui/toolchain.in @@ -802,18 +802,20 @@ config FREETZ_TARGET_TOOLCHAIN comment "Host-tools options ----------------------------------" choice - prompt "Patchelf compatibility" if !FREETZ_HOSTTOOLS_DOWNLOAD + prompt "Patchelf version" if !FREETZ_HOSTTOOLS_DOWNLOAD default FREETZ_TOOLS_PATCHELF_VERSION_CURRENT config FREETZ_TOOLS_PATCHELF_VERSION_ABANDON - bool "gcc 5" + bool "old" depends on !FREETZ_HOSTTOOLS_DOWNLOAD help For usage with old Ubuntu 14 config FREETZ_TOOLS_PATCHELF_VERSION_CURRENT - bool "gcc 7" + bool "new" depends on !FREETZ_ANCIENT_SYSTEM + help + Requires at least gcc v7 endchoice diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 24756f35cf..68a97e75b8 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -45,6 +45,7 @@ Latest changes - Host tools: * kconfig 6.2 + * patchelf 0.14.5/0.15.0 - Packages: * Curl 7.88.1 diff --git a/make/host-tools/patchelf-host/patchelf-host.mk b/make/host-tools/patchelf-host/patchelf-host.mk index 5244a858f0..65c54e6dff 100644 --- a/make/host-tools/patchelf-host/patchelf-host.mk +++ b/make/host-tools/patchelf-host/patchelf-host.mk @@ -1,7 +1,7 @@ -$(call TOOLS_INIT, $(if $(FREETZ_TOOLS_PATCHELF_VERSION_ABANDON),0.14.5,0.17.2)) +$(call TOOLS_INIT, $(if $(FREETZ_TOOLS_PATCHELF_VERSION_ABANDON),0.14.5,0.15.0)) $(PKG)_SOURCE:=patchelf-$($(PKG)_VERSION).tar.bz2 $(PKG)_HASH_ABANDON:=b9a46f2989322eb89fa4f6237e20836c57b455aa43a32545ea093b431d982f5c -$(PKG)_HASH_CURRENT:=bae2ea376072e422c196218dd9bdef0548ccc08da4de9f36b4672df84ea2d8e2 +$(PKG)_HASH_CURRENT:=f4036d3ee4d8e228dec1befff0f6e46d8a40e9e570e0068e39d77e62e2c8bdc2 $(PKG)_HASH:=$($(PKG)_HASH_$(if $(FREETZ_TOOLS_PATCHELF_VERSION_ABANDON),ABANDON,CURRENT)) $(PKG)_SITE:=https://github.com/NixOS/patchelf/releases/download/$($(PKG)_VERSION),https://releases.nixos.org/patchelf/patchelf-$($(PKG)_VERSION) ### WEBSITE:=https://opencollective.com/nixos @@ -12,8 +12,6 @@ $(PKG)_SITE:=https://github.com/NixOS/patchelf/releases/download/$($(PKG)_VERSIO $(PKG)_CONDITIONAL_PATCHES+=$(if $(FREETZ_TOOLS_PATCHELF_VERSION_ABANDON),abandon,current) $(PKG)_REBUILD_SUBOPTS += FREETZ_TOOLS_PATCHELF_VERSION_ABANDON -$(PKG)_CONFIGURE_OPTIONS += --prefix=/ - $(TOOLS_SOURCE_DOWNLOAD) $(TOOLS_UNPACKED)