From e36651ec5fac6f0702aaa20095af279ba973bb56 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Sun, 28 Apr 2024 21:35:58 -0400 Subject: [PATCH] Fix build test results Resolves: RHEL-30154 --- compat-sap-c++-13.spec | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/compat-sap-c++-13.spec b/compat-sap-c++-13.spec index 09c8609..6e7aa62 100644 --- a/compat-sap-c++-13.spec +++ b/compat-sap-c++-13.spec @@ -149,7 +149,7 @@ Summary: C++ compatibility runtime library for SAP applications Name: %{?scl_prefix}c++-13 ExclusiveArch: x86_64 ppc64le s390x Version: %{gcc_version} -Release: %{gcc_release}.3%{?dist} +Release: %{gcc_release}.3.1%{?dist} # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD @@ -791,23 +791,8 @@ ln -sf compat-sap-c++-%{gcc_version}.so %{buildroot}%{_root_prefix}/%{_lib}/comp %check cd obj-%{gcc_target_platform} -%{?scl:PATH=%{_bindir}${PATH:+:${PATH}}} -# Test against the system libstdc++.so.6 + libstdc++_nonshared.a combo -mv %{gcc_target_platform}/libstdc++-v3/src/.libs/libstdc++.so.6{,.not_here} -mv %{gcc_target_platform}/libstdc++-v3/src/.libs/libstdc++.so{,.not_here} -ln -sf %{?scl:%{_root_prefix}}%{!?scl:%{_prefix}}/%{_lib}/libstdc++.so.6 \ - %{gcc_target_platform}/libstdc++-v3/src/.libs/libstdc++.so.6 -echo '/* GNU ld script - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ -%{oformat} -INPUT ( %{?scl:%{_root_prefix}}%{!?scl:%{_prefix}}/%{_lib}/libstdc++.so.6 -lstdc++_nonshared )' \ - > %{gcc_target_platform}/libstdc++-v3/src/.libs/libstdc++.so -cp -a %{gcc_target_platform}/libstdc++-v3/src/.libs/libstdc++_nonshared%{nonsharedver}.a \ - %{gcc_target_platform}/libstdc++-v3/src/.libs/libstdc++_nonshared.a - # run the tests. -LC_ALL=C make %{?_smp_mflags} -k check-c++ ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ \ +LC_ALL=C make %{?_smp_mflags} -k check ALT_CC_UNDER_TEST=gcc ALT_CXX_UNDER_TEST=g++ \ %if 0%{?fedora} >= 20 || 0%{?rhel} > 7 RUNTESTFLAGS="--target_board=unix/'{,-fstack-protector-strong}'" || : %else @@ -882,5 +867,5 @@ fi %end %changelog -* Tue Apr 09 2024 Patrick Palka 13.2.1-6.3 +* Sun Apr 28 2024 Patrick Palka 13.2.1-6.3.1 - new package