[Arch-excludes] Architecture specific change in rpms/dotnet3.1.git

The package rpms/dotnet3.1.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dotnet3.1.git/commit/?id=e976f55f....

Change:
+%ifarch aarch64

Thanks.


Full change:
============

commit e976f55f00dc99ab395594779204aeb7f6e20446
Author: Tom Stellard <tstellar(a)redhat.com&gt;
Date:   Mon Sep 21 12:50:12 2020 -0400

    Use toolchain macro for setting clang-specific c/ld flags
    
    This ensures that the package will always use the correct set of
    clang supported flags.

diff --git a/dotnet3.1.spec b/dotnet3.1.spec
index 5736d7d..52bd0a6 100644
--- a/dotnet3.1.spec
+++ b/dotnet3.1.spec
@@ -20,16 +20,6 @@
 # until that's done, disable LTO.  This has to happen before setting the flags
below.
 %define _lto_cflags %{nil}
 
-# a generator program getting mis-compiled
-# Filter flags not supported by clang
-#  -fstack-clash-protection
-#  -specs=
-%global dotnet_cflags %(echo %optflags | sed -e 's/-fstack-clash-protection//' |
sed -re 's/-specs=[^ ]*//g')
-%ifarch aarch64
-# mbranch-protection=standard breaks unwinding in CoreCLR through libunwind
-%global dotnet_cflags %(echo %dotnet_cflags | sed -e 's/-mbranch-protection=standard
//')
-%endif
-%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
 %global host_version 3.1.8
 %global runtime_version 3.1.8
@@ -65,7 +55,7 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Core Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and
EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@@ -413,9 +403,34 @@ cat /etc/os-release
 cp -a %{_libdir}/dotnet previously-built-dotnet
 %endif
 
+%if 0%{?fedora} > 32 || 0%{?rhel} > 8
+# Setting this macro ensures that only clang supported options will be
+# added to ldflags and cflags.
+%global toolchain clang
+%set_build_flags
+%else
+# Filter flags not supported by clang
+#  -specs=
+%global dotnet_cflags %(echo %optflags | sed -re 's/-specs=[^ ]*//g')
+%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 export CFLAGS="%{dotnet_cflags}"
 export CXXFLAGS="%{dotnet_cflags}"
 export LDFLAGS="%{dotnet_ldflags}"
+%endif
+
+%ifarch aarch64
+# mbranch-protection=standard breaks unwinding in CoreCLR through libunwind
+CFLAGS=$(echo $CFLAGS | sed -e 's/-mbranch-protection=standard //')
+CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-mbranch-protection=standard //')
+%endif
+
+# fstack-clash-protection breaks CoreCLR
+CFLAGS=$(echo $CFLAGS  | sed -e 's/-fstack-clash-protection//' )
+CXXFLAGS=$(echo $CXXFLAGS  | sed -e 's/-fstack-clash-protection//' )
+
+echo $CFLAGS
+echo $CXXFLAGS
+echo $LDFLAGS
 
 #%%if %%{without bootstrap}
 #  --with-ref-packages %%{_libdir}/dotnet/reference-packages/ \
@@ -540,6 +555,12 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Thu Jul 16 2020 Tom Stellard <tstellar(a)redhat.com&gt; - 3.1.108-2
+- Use toolchain macro for setting clang-specific c/ld flags
+
+* Wed Sep 16 2020 Troy Dawson <tdawson(a)redhat.com&gt; - 3.1.108-1
+- Generate runtime_id the same way that it does in the various build scripts
+
 * Fri Sep 11 2020 Omair Majid <omajid(a)redhat.com&gt; - 3.1.108-1
 - Update to .NET Core SDK 3.1.108 and Runtime 3.1.8
 

commit 42b911fdf36ab884e60496e66a9697803482e3bf
Author: Omair Majid <omajid(a)redhat.com&gt;
Date:   Thu Sep 17 15:24:53 2020 -0400

    Only use the major version for runtime-id

diff --git a/dotnet3.1.spec b/dotnet3.1.spec
index 1aa334f..5736d7d 100644
--- a/dotnet3.1.spec
+++ b/dotnet3.1.spec
@@ -61,7 +61,7 @@
 %global runtime_arch arm64
 %endif
 
-%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo
"$ID.$VERSION_ID")-%{runtime_arch}}
+%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo
"${ID}.${VERSION_ID%%.*}")-%{runtime_arch}}
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}