From 5a558f96b8ef33b32aa1cad689cb5f862fe398f6 Mon Sep 17 00:00:00 2001 From: xujing Date: Thu, 21 Mar 2024 19:46:34 +0800 Subject: [PATCH] don't delete the commented code in macros --- ...t-for-selecting-clang-as-a-toolchain.patch | 2 +- Delete-the-commented-code.patch | 40 +------------------ openEuler-rpm-config.spec | 5 ++- 3 files changed, 6 insertions(+), 41 deletions(-) diff --git a/Add-support-for-selecting-clang-as-a-toolchain.patch b/Add-support-for-selecting-clang-as-a-toolchain.patch index 1b00ca8..c38c7cb 100644 --- a/Add-support-for-selecting-clang-as-a-toolchain.patch +++ b/Add-support-for-selecting-clang-as-a-toolchain.patch @@ -96,7 +96,7 @@ index 5fdaf0a..0062126 100755 %_hardened_build 1 %_hardened_cflags %{?_hardened_build:%{_hardening_cflags}} @@ -195,7 +243,11 @@ - # use "%define _ld_as_needed 1" to enable. + #%_ld_as_needed 1 %_ld_as_needed_flags %{?_ld_as_needed:-Wl,--as-needed} -%__global_compiler_flags -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags} diff --git a/Delete-the-commented-code.patch b/Delete-the-commented-code.patch index 8f27e4e..b9f0469 100644 --- a/Delete-the-commented-code.patch +++ b/Delete-the-commented-code.patch @@ -5,8 +5,7 @@ Subject: [PATCH] Delete the commented code --- brp-digest-list | 1 - - macros | 7 ------- - 2 files changed, 8 deletions(-) + 1 file changed, 1 deletion(-) diff --git a/brp-digest-list b/brp-digest-list index 77248c9..7de42b7 100644 @@ -20,43 +19,6 @@ index 77248c9..7de42b7 100644 TMPDIR="/tmp" BIN_PKG_FILES=${TMPDIR}/${3%%.rpm} cat - > $BIN_PKG_FILES -diff --git a/macros b/macros -index 52df0f6..bf672e2 100644 ---- a/macros -+++ b/macros -@@ -16,10 +16,8 @@ - %_fmoddir %{_libdir}/gfortran/modules - - %_enable_debug_packages 1 --#%_include_minidebuginfo 1 - %_include_gdb_index 1 - %_debugsource_packages 1 --#%_debuginfo_subpackages 1 - - %_build_id_links none - -@@ -188,11 +186,9 @@ - # Fail linking if there are undefined symbols. Required for proper - # ELF symbol versioning support. Disabled by default. - # Use "%define _ld_strict_symbol_defs 1" to enable. --#%_ld_strict_symbol_defs 1 - %_ld_symbols_flags %{?_ld_strict_symbol_defs:-Wl,-z,defs} - - # use "%define _ld_as_needed 1" to enable. --#%_ld_as_needed 1 - %_ld_as_needed_flags %{?_ld_as_needed:-Wl,--as-needed} - - %__global_compiler_flags -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -grecord-gcc-switches %{_hardened_cflags} -@@ -304,9 +300,6 @@ Requires: man info \ - %description help \ - Man pages and other related documents for %{name}. - --#%sbin_installinfo_rm bc.info --#%sbin_installinfo_rm bc.info.gz -- - %install_info() \ - /sbin/install-info %1 %{_infodir}/dir || : - -- 2.33.0 diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 93a844a..896bca5 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 55 +Release: 56 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -150,6 +150,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Mon Apr 29 2024 xujing - 30-56 +- don't delete the commented code in macros + * Sun Apr 28 2024 laokz - 30-55 - add riscv64 to some arches macro -- Gitee