SPECS/compat-sap-c++-10.spec

@@ -15,7 +15,7 @@
 %global gcc_release 1
 %global _unpackaged_files_terminate_build 0
 %undefine _annotated_build
-%global multilib_64_archs sparc64 ppc64 x86_64
+%global multilib_64_archs sparc64 ppc64 s390x x86_64
 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64
 %global attr_ifunc 1
 %else
@@ -26,9 +26,9 @@
 %endif
 Summary: C++ compatibility runtime library for SAP applications
 Name: %{?scl_prefix}c++-10
-ExclusiveArch: x86_64 ppc64le s390x
+ExclusiveArch: x86_64 ppc64le
 Version: %{gcc_version}
-Release: %{gcc_release}.1%{?dist}
+Release: %{gcc_release}%{?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
@@ -272,9 +272,10 @@ CONFIGURE_OPTS="\
 	--prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
 	--with-bugurl=http://bugzilla.redhat.com/bugzilla \
 	--enable-shared --enable-threads=posix --enable-checking=release \
-	--disable-multilib \
 %ifarch ppc64le
-	--enable-targets=powerpcle-linux \
+	--enable-targets=powerpcle-linux --disable-multilib \
+%else
+	--enable-multilib \
 %endif
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
 	--enable-gnu-unique-object \
@@ -402,10 +403,6 @@ rm -rf %{buildroot}
 %{_root_prefix}/%{_lib}/README%{gcc_major}
 
 %changelog
-* Thu May 26 2022 Marek Polacek <polacek@redhat.com> 10.2.1-1.1
-- build on s390x too (#2065777)
-- disable multilib
-
 * Wed Jul 29 2020 Marek Polacek <polacek@redhat.com> 10.2.1-1
 - GCC 10.2 release
 - disable -flto in %%{optflags}, lto bootstrap will be enabled the GCC way