diff --git a/backport-ld-Remove-JANSSON_LIBS-from-ld_new_DEPENDENCIES.patch b/backport-ld-Remove-JANSSON_LIBS-from-ld_new_DEPENDENCIES.patch new file mode 100644 index 0000000000000000000000000000000000000000..d598c73eca9798fb2d6ba84b863bc90552322b84 --- /dev/null +++ b/backport-ld-Remove-JANSSON_LIBS-from-ld_new_DEPENDENCIES.patch @@ -0,0 +1,47 @@ +From 9e9a27707e9342f2002f7673421d4abbafc883ec Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 19 Jun 2024 14:24:35 -0700 +Subject: [PATCH] ld: Remove JANSSON_LIBS from ld_new_DEPENDENCIES + +Remove JANSSON_LIBS from ld_new_DEPENDENCIES since ld_new_DEPENDENCIES +should only contain binutils dependencies. + + PR ld/31909 + * Makefile.am (ld_new_DEPENDENCIES): Remove JANSSON_LIBS. + * Makefile.in: Regenerated. + +Signed-off-by: H.J. Lu +--- + ld/Makefile.am | 2 +- + ld/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ld/Makefile.am b/ld/Makefile.am +index f9ee05b1400..6a9833e5775 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -658,7 +658,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai + ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c plugin.c \ + ldbuildid.c + ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \ +- $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP) $(JANSSON_LIBS) ++ $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP) + ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \ + $(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) + +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 8350f00a521..8639e782cdf 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -1036,7 +1036,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai + ldbuildid.c + + ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) \ +- $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP) $(JANSSON_LIBS) ++ $(BFDLIB) $(LIBCTF) $(LIBIBERTY) $(LIBINTL_DEP) + + ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBCTF) \ + $(LIBIBERTY) $(LIBINTL) $(ZLIB) $(ZSTD_LIBS) $(JANSSON_LIBS) +-- +2.33.0 + diff --git a/binutils.spec b/binutils.spec index 1ec6b5b3de0cc9916816395fabfa93a373526f97..e139c5e8f1caaf861796c66fab5783e873b27308 100644 --- a/binutils.spec +++ b/binutils.spec @@ -2,7 +2,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?_with_debug:-debug} Version: 2.41 -Release: 5 +Release: 6 License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND GFDL-1.3-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later URL: https://sourceware.org/binutils @@ -175,6 +175,7 @@ Patch3007: LoongArch-fix-internal-error-when-as-handling-unsupp.patch Patch3008: as-Add-new-atomic-instructions-in-LoongArch-v1.1.patch Patch3009: as-Add-new-estimated-reciprocal-instructions-in-Loon.patch Patch3010: LoongArch-Modify-inconsistent-behavior-of-ld-with-un.patch +Patch3011: backport-ld-Remove-JANSSON_LIBS-from-ld_new_DEPENDENCIES.patch # Part 5000 - @@ -1270,6 +1271,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Thu Jun 20 2024 huyubiao - 2.41-6 +- fix ld-new compilation failure on 32-bit systems + * Mon Apr 15 2024 Peng Fan - 2.41-5 - SPEC: add build-require 'bison' for LoongArch