From 80373ba83a517bb98ba387e9262031bf540d5618 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Jan 31 2022 16:13:08 +0000
Subject: 10.1, w/ modern linker, this time for real


Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

---

diff --git a/0001-configure.ac.patch b/0001-configure.ac.patch
new file mode 100644
index 0000000..854e3fb
--- /dev/null
+++ b/0001-configure.ac.patch
@@ -0,0 +1,11 @@
+--- glusterfs-10.1/configure.ac.orig	2022-01-27 11:44:31.235010060 -0500
++++ glusterfs-10.1/configure.ac	2022-01-27 11:46:36.601774148 -0500
+@@ -1280,7 +1280,7 @@
+ AC_SUBST(GF_DISTRIBUTION)
+ 
+ GF_HOST_OS=""
+-GF_LDFLAGS="${GF_LDFLAGS} -rdynamic"
++GF_LDFLAGS="${GF_LDFLAGS} -rdynamic -fuse-ld=mold"
+ 
+ dnl see --with-libtirpc option check above, libtirpc(-devel) is required for
+ dnl ipv6-default
diff --git a/glusterfs.spec b/glusterfs.spec
index dd25de2..e09865d 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -201,7 +201,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          10.1
-Release:          3%{?prereltag:%{prereltag}}%{?dist}
+Release:          4%{?prereltag:%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -218,6 +218,7 @@ Source8:          glusterfsd.init
 %else
 Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 %endif
+Patch0001:        0001-configure.ac.patch
 
 Requires(pre):    shadow-utils
 BuildRequires:    systemd
@@ -819,6 +820,9 @@ This package provides the glusterfs thin-arbiter translator.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
+%ifarch x86_64 aarch64
+%patch0001 -p1
+%endif
 %if ( ! %{_usepython3} )
 echo "fixing python shebangs..."
 for f in api events extras geo-replication libglusterfs tools xlators; do
@@ -852,6 +856,11 @@ sed -i -e 's/--quiet//' configure.ac
         %{?_without_libtirpc} \
 	%{?_without_tcmalloc}
 
+# remove option mold doesn't recognize
+for file in $(find . -type f -name Makefile -print); do
+sed -i -e 's/-Wl,-dT.*$//' $file
+done
+
 # fix hardening and remove rpath in shlibs
 %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
 sed -i 's| \\\$compiler_flags |&\\\$LDFLAGS |' libtool
@@ -1626,6 +1635,9 @@ exit 0
 %{_unitdir}/gluster-ta-volume.service
 
 %changelog
+* Mon Jan 31 2022  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 10.1-4
+- 10.1, w/ modern linker, this time for real
+
 * Wed Jan 26 2022  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 10.1-3
 - 10.1, w/ modern linker (mold)