From 0626a2b61a509654bdc2f1a8403a041667e40572 Mon Sep 17 00:00:00 2001 From: Akshay Bhat Date: Sun, 30 Jul 2023 20:55:26 +0200 Subject: [PATCH] package/libiberty: bump version to 2.40 If the libiberty package is not the same version as the one packaged with binutils AND if libiberty is installed before binutils, then the below error is observed. Hence for now let us keep the versions in sync. /usr/bin/ld: ../libiberty/libiberty.a(hashtab.o):(.data.rel.local+0x0) : multiple definition of `htab_eq_pointer' Fixes: http://autobuild.buildroot.net/results/f07/f077ec588b395102ad501a18c85d5030c0765031/ Build-tested using these four defconfigs: ---------- BR2_arceb=y ---------- BR2_BINUTILS_VERSION_2_38_X=y ---------- (empty defconfig meaning binutils-2.39) ---------- BR2_BINUTILS_VERSION_2_40_X=y ---------- each using these commands: $ make host-libiberty $ make host-binutils Signed-off-by: Akshay Bhat [Bernd: bump to version 2.40, replace hash file with link to binutils] Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/libiberty/libiberty.hash | 6 +----- package/libiberty/libiberty.mk | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) mode change 100644 => 120000 package/libiberty/libiberty.hash diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash deleted file mode 100644 index 0dafcea520..0000000000 --- a/package/libiberty/libiberty.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz - -# Locally computed, same as binutils.hash -sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB diff --git a/package/libiberty/libiberty.hash b/package/libiberty/libiberty.hash new file mode 120000 index 0000000000..e0655d3af3 --- /dev/null +++ b/package/libiberty/libiberty.hash @@ -0,0 +1 @@ +../binutils/binutils.hash \ No newline at end of file diff --git a/package/libiberty/libiberty.mk b/package/libiberty/libiberty.mk index 6235a8b956..e7a02c963a 100644 --- a/package/libiberty/libiberty.mk +++ b/package/libiberty/libiberty.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIBERTY_VERSION = 2.32 +LIBIBERTY_VERSION = 2.40 LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils HOST_LIBIBERTY_DL_SUBDIR = binutils