From 24ba8b1e4223a6ed1c240ca75d4766a93e1895ab Mon Sep 17 00:00:00 2001 From: Weisson Date: Fri, 21 Jun 2024 11:39:01 +0800 Subject: [PATCH] Adapt to sw_64. - Fix: annobin for sw_64 does not work, so disable it. - Fix: glibc-gconv-extras has not been split out from glibc on sw_64. Signed-off-by: Weisson --- macros | 2 +- system-rpm-config.spec | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/macros b/macros index bd90b99..4278511 100644 --- a/macros +++ b/macros @@ -242,7 +242,7 @@ print(result) %_hardened_cflags %{?_hardened_build:%{_hardening_cflags}} %_hardened_ldflags %{?_hardened_build:%{_hardening_ldflags}} -%_annobin_cflags -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 +%_annobin_cflags %{nil} # Add extra information to binary objects created by gcc for Fedora 28: # https://pagure.io/fesco/issue/1780 (accepted on 2017-10-30) diff --git a/system-rpm-config.spec b/system-rpm-config.spec index 6bd53e7..ad76494 100644 --- a/system-rpm-config.spec +++ b/system-rpm-config.spec @@ -3,7 +3,7 @@ # 1) Don't add patches, dist-git is the upstream repository for this package. # 2) When making changes, update version by +1, leave release alone. # -%define anolis_release .0.3 +%define anolis_release .0.4 Summary: Anolis OS specific rpm configuration files Name: system-rpm-config @@ -117,11 +117,6 @@ Requires: %{_bindir}/grep Requires: %{_bindir}/sed Requires: %{_bindir}/xargs -# iconv modules have been split out of glibc into a separate package (#1971664) -# so let's ensure packages that require them at build time but haven't yet -# added an explicit BuildRequires will continue to work (#2013328) -Requires: glibc-gconv-extra - # -fstack-clash-protection and -fcf-protection require GCC 8. Conflicts: gcc < 8 @@ -219,6 +214,10 @@ install -p -m 755 %{SOURCE21} %{buildroot}%{_rpmconfigdir}/kabi.sh %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Fri Jun 21 2024 Weisson - 129-1.0.4 +- Fix: annobin for sw_64 does not work, so disable it. +- Fix: glibc-gconv-extras has not been split out from glibc on sw_64. + * Wed Jun 19 2024 wxiat - 129-1.0.3 - add sw arch -- Gitee