From 304691540c11a34716f9918808d07415090e3206 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Thu, 16 Jul 2020 10:55:20 +0300 Subject: [PATCH] Bring back riscv64 support Signed-off-by: David Abdurachmanov --- samba.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/samba.spec b/samba.spec index 7523dd8..7e883ce 100644 --- a/samba.spec +++ b/samba.spec @@ -19,9 +19,9 @@ %define pre_release rc1 %if "x%{?pre_release}" != "x" -%define samba_release 0.%{main_release}.%{pre_release}%{?dist} +%define samba_release 0.%{main_release}.%{pre_release}.0.riscv64%{?dist} %else -%define samba_release %{main_release}%{?dist} +%define samba_release %{main_release}.0.riscv64%{?dist} %endif # This is a network daemon, do a hardened build @@ -41,7 +41,7 @@ %global with_vfs_cephfs 0 %if 0%{?fedora} -%ifarch aarch64 ppc64le s390x x86_64 +%ifarch aarch64 ppc64le s390x x86_64 riscv64 %global with_vfs_cephfs 1 #endifarch %endif @@ -862,8 +862,10 @@ xzcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} - # TODO: resolve underlinked python modules export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')" -# Use the gold linker +# Use the gold linker, except RISC-V (riscv64), which does not have gold +%ifnarch riscv64 export LDFLAGS="%{__global_ldflags} -fuse-ld=gold" +%endif %configure \ --enable-fhs \ @@ -3619,6 +3621,9 @@ fi %endif %changelog +* Thu Jul 16 2020 David Abdurachmanov - 4.13.0rc1-1.0.riscv64 +- Add support for riscv64 + * Tue Jul 14 2020 Andreas Schneider - 4.13.0rc1-1 - Move mdssvc data files to correct package