From d8a1718f51bb2648cf02cc2fc3d5b24ef4dab741 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sun, 6 Apr 2025 00:48:57 +0800 Subject: [PATCH] %_fix_broken_configure_for_lto: preserve line continuations --- macros | 2 +- openEuler-rpm-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros b/macros index 8ecc48c..893b719 100644 --- a/macros +++ b/macros @@ -199,7 +199,7 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end diff -u $file.backup $file && mv $file.backup $file \ %{__sed} --in-place=.backup '1{$!N;$!N};$!N;s/int x = 1;\\nint y = 0;\\nint z;\\nint nan;/volatile int x = 1; volatile int y = 0; volatile int z, nan;/;P;D' $file; \ diff -u $file.backup $file && mv $file.backup $file \ - %{__sed} --in-place=.backup 's#^lt_cv_sys_global_symbol_to_cdecl=.*#lt_cv_sys_global_symbol_to_cdecl="sed -n -e '"'"'s/^T .* \\\\(.*\\\\)$/extern int \\\\1();/p'"'"' -e '"'"'s/^$symcode* .* \\\\(.*\\\\)$/extern char \\\\1;/p'"'"'"#' $file; \ + %{__sed} -r --in-place=.backup '/lt_cv_sys_global_symbol_to_cdecl=/s#(".*"|'"'"'.*'"'"')#"sed -n -e '"'"'s/^T .* \\\\(.*\\\\)$/extern int \\\\1();/p'"'"' -e '"'"'s/^$symcode* .* \\\\(.*\\\\)$/extern char \\\\1;/p'"'"'"#' $file; \ diff -u $file.backup $file && mv $file.backup $file \ done diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index adc7cdc..e70b863 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 31 -Release: 21 +Release: 22 License: GPL+ AND MIT Summary: specific rpm configuration files URL: https://gitee.com/src-openeuler/openEuler-rpm-config @@ -210,6 +210,9 @@ sed -i "s|@OSCPE@|$(cat /etc/system-release-cpe)|" %{buildroot}%{rpmvdir}/%{vend %{rpmvdir}/find-requires.ksyms %changelog +* Sun Apr 06 2025 Funda Wang - 31-22 +- %%_fix_broken_configure_for_lto: preserve line continuations + * Thu Mar 20 2025 Funda Wang - 31-21 - move out x86-64 optflags for moving towards v3 -- Gitee