diff --git a/macros b/macros index 7e393a4b2185d8033976fe7cd1c3de70f7c65178..0fa7c8db6eef13ddffea63836d28bd37e0f44621 100644 --- a/macros +++ b/macros @@ -193,7 +193,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 fa0265e66e971091822d9cba27b43fe5a5075226..08acefab61fd9dd018f10be94e4ca2b5d767e065 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 31 -Release: 18 +Release: 19 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/src-openeuler/openEuler-rpm-config @@ -192,6 +192,9 @@ sed -i "s/@VENDOR@/%{vendor}/g" `grep "@VENDOR@" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Mon Apr 28 2025 yanglongkang - 31-19 +- %_fix_broken_configure_for_lto: preserve line continuations + * Wed Mar 19 2025 lingsheng - 31-18 - Remove webkit2gtk3 in mold whitelist