From 6ae4e67c038ad40eb7e653835ed2db05ac1b8b64 Mon Sep 17 00:00:00 2001 From: huyubiao Date: Mon, 5 Aug 2024 17:04:40 +0800 Subject: [PATCH] delete jansson (cherry picked from commit a3d3e5400bc33f2ecacdac062d5eec28badb3a3e) --- binutils.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/binutils.spec b/binutils.spec index e139c5e..49e3eed 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: 6 +Release: 7 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 @@ -260,7 +260,7 @@ Conflicts: gcc-c++ < 4.0.0 %endif %if %{without bootstrap} -BuildRequires: gettext, flex, jansson-devel +BuildRequires: gettext, flex %if %{with systemzlib} BuildRequires: zlib-devel %endif @@ -541,10 +541,6 @@ compute_global_configuration() --enable-64-bit-bfd \ --with-bugurl=https://gitee.com/src-openeuler/binutils/issues/" -%if %{without bootstrap} - CARGS="$CARGS --enable-jansson=yes" -%endif - %if %{with debuginfod} CARGS="$CARGS --with-debuginfod" %endif @@ -1271,6 +1267,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Mon Aug 5 2024 huyubiao - 2.41-7 +- delete jansson + * Thu Jun 20 2024 huyubiao - 2.41-6 - fix ld-new compilation failure on 32-bit systems -- Gitee