开源软件构建与测试

Changes of Revision 14

_service:tar_scm:Call-set_build_flags-cc-before-build-check-and-insta.patch Changed

@@ -5,30 +5,32 @@
  %install stages
 
 ---
- macros | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ macros | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
 
 diff --git a/macros b/macros
 index 0062126..8c16706 100755
 --- a/macros
 +++ b/macros
-@@ -83,6 +83,20 @@
+@@ -83,6 +83,22 @@
    FCFLAGS="${FCFLAGS:-%{build_fflags}}" ; export FCFLAGS ; \
    LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS
  
 +# Automatically use set_build_flags macro for build, check, and
 +# install phases.
 +# Use "%undefine _auto_set_build_flags" to disable"
-+%_auto_set_build_flags 0
-+%__spec_build_pre %{___build_pre} %%{_auto_set_build_flags} ? "%{set_build_flags}" : ""
-+%__spec_check_pre %{___check_pre} %%{_auto_set_build_flags} ? "%{set_build_flags}" : ""
-+
 +# Automatically use set_build_cc macro for build, check, and
 +# install phases.
 +# Use "%undefine _auto_set_build_cc" to disable"
 +%_auto_set_build_cc %"%{toolchain}" == "gcc" ? 0 : 1
-+%__spec_build_pre %{___build_pre} %%{_auto_set_build_cc} ? "%{set_build_cc}" : ""
-+%__spec_check_pre %{___check_pre} %%{_auto_set_build_cc} ? "%{set_build_cc}" : ""
++%_auto_set_build_flags 0
++
++%__spec_build_pre %{___build_pre} \
++  %%{_auto_set_build_cc} ? "%{set_build_cc}" : "" \
++  %%{_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}" : ""
 +
  #For backwards compatibility only.
  %__global_cflags %{build_cflags}
@@ -37,8 +39,8 @@
       "$RPM_BUILD_ROOT" != "/"  && rm -rf "${RPM_BUILD_ROOT}"\
      mkdir -p `dirname "$RPM_BUILD_ROOT"`\
      mkdir "$RPM_BUILD_ROOT"\
-+    %%{_auto_set_build_flags} ? "%{set_build_flags}" : ""\
 +    %%{_auto_set_build_cc} ? "%{set_build_cc}" : ""\
++    %%{_auto_set_build_flags} ? "%{set_build_flags}" : ""\
  %{nil}
  
  # ---- Expanded at end of %install scriptlet.