From 8e29421e267d21194f9d7300c12b47f451d9e81a Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 28 Oct 2021 11:13:00 -0400
Subject: [PATCH] 10.0 RC0, armv7hl

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 glusterfs.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/glusterfs.spec b/glusterfs.spec
index d4de1bf..32ddc8f 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -197,7 +197,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          10.0
-Release:          0.1%{?prereltag:%{prereltag}}%{?dist}
+Release:          0.2%{?prereltag:%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -205,8 +205,6 @@ Release:          0.@PACKAGE_RELEASE@%{?dist}.10
 %endif
 License:          GPLv2 or LGPLv3+
 URL:              http://docs.gluster.org/
-# armv7hl gives undefined reference to `_uatomic_link_error'
-ExcludeArch:      armv7hl
 %if ( 0%{_for_fedora_koji_builds} )
 Source0:          http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-%{version}%{?prereltag}.tar.gz
 Source1:          glusterd.sysconfig
@@ -822,6 +820,10 @@ done
 %endif
 
 %build
+%ifarch armv7hl
+%set_build_flags
+export CFLAGS="$(echo $CFLAGS) -DUATOMIC_NO_LINK_ERROR"
+%endif
 sed -i -e 's/--quiet//' configure.ac
 ./autogen.sh && %configure \
         %{?_with_asan} \
@@ -851,7 +853,6 @@ sed -i 's| \\\$compiler_flags |&\\\$LDFLAGS |' libtool
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|' libtool
 
-gcc -v
 %make_build V=1 GCC_COLORS=
 
 %check
@@ -1619,6 +1620,9 @@ exit 0
 %{_unitdir}/gluster-ta-volume.service
 
 %changelog
+* Thu Oct 28 2021  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 10.0-0.2rc0
+- 10.0 RC0, armv7hl
+
 * Tue Oct 19 2021  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 10.0-0.1rc0
 - 10.0 RC0