From 6b3dab8f4a499f4aec7688d97ad5e1d68daa8719 Mon Sep 17 00:00:00 2001 From: liyunfei Date: Tue, 6 Aug 2024 10:11:43 +0800 Subject: [PATCH] Fix for "%undefine _auto_set_build_XX" usage Fix for using "%undefine _auto_set_build_XX" casue error: macro expansion did not return an integer: %{_auto_set_build_flags} ? "%{set_build_flags}" : "" Signed-off-by: liyunfei (cherry picked from commit ed8ceb77753395a266c93074f695798ce6092a75) --- ...build_flags-cc-before-build-check-and-insta.patch | 12 ++++++------ openEuler-rpm-config.spec | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Call-set_build_flags-cc-before-build-check-and-insta.patch b/Call-set_build_flags-cc-before-build-check-and-insta.patch index 09ed693..8f69298 100644 --- a/Call-set_build_flags-cc-before-build-check-and-insta.patch +++ b/Call-set_build_flags-cc-before-build-check-and-insta.patch @@ -26,11 +26,11 @@ index 0062126..8c16706 100755 +%_auto_set_build_flags 0 + +%__spec_build_pre %{___build_pre} \ -+ %[%{_auto_set_build_cc} ? "%{set_build_cc}" : ""] \ -+ %[%{_auto_set_build_flags} ? "%{set_build_flags}" : ""] ++ %[0%{?_auto_set_build_cc} ? "%{set_build_cc}" : ""] \ ++ %[0%{?_auto_set_build_flags} ? "%{set_build_flags}" : ""] +%__spec_check_pre %{___build_pre} \ -+ %[%{_auto_set_build_cc} ? "%{set_build_cc}" : ""] \ -+ %[%{_auto_set_build_flags} ? "%{set_build_flags}" : ""] ++ %[0%{?_auto_set_build_cc} ? "%{set_build_cc}" : ""] \ ++ %[0%{?_auto_set_build_flags} ? "%{set_build_flags}" : ""] + #For backwards compatibility only. %__global_cflags %{build_cflags} @@ -39,8 +39,8 @@ index 0062126..8c16706 100755 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\ mkdir -p `dirname "$RPM_BUILD_ROOT"`\ mkdir "$RPM_BUILD_ROOT"\ -+ %[%{_auto_set_build_cc} ? "%{set_build_cc}" : ""]\ -+ %[%{_auto_set_build_flags} ? "%{set_build_flags}" : ""]\ ++ %[0%{?_auto_set_build_cc} ? "%{set_build_cc}" : ""]\ ++ %[0%{?_auto_set_build_flags} ? "%{set_build_flags}" : ""]\ %{nil} # ---- Expanded at end of %install scriptlet. diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 5abd954..b6d62ff 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 57 +Release: 58 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -151,6 +151,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Tue Aug 6 2024 liyunfei - 30-58 +- Fix for "%undefine _auto_set_build_XX" usage + * Wed Jul 10 2024 xujing - 30-57 - enable --as-needed by default -- Gitee