Attempt to have -latomic before -Wl,--as-needed

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
Merge remote-tracking branch 'up/master' into master-riscv64
2019-03-23 08:13:45 +01:00 · 2019-03-21 15:54:31 +01:00 · 2018-05-03 18:53:00 +02:00 · 2018-05-03 09:09:56 +02:00 · 2018-05-02 23:48:35 +02:00 · 2018-05-01 07:37:09 +02:00
1 changed files with 11 additions and 2 deletions
--- a/ceph.spec
+++ b/ceph.spec
@ -27,7 +27,7 @@

 %bcond_without ocf
 %bcond_with make_check
-%ifarch s390 s390x
+%ifarch s390 s390x riscv64
 %bcond_with tcmalloc
 %else
 %bcond_without tcmalloc
@ -104,7 +104,7 @@
 #################################################################################
 Name:		ceph
 Version:	14.2.0
-Release:	1%{?dist}
+Release:	1.0.riscv64%{?dist}
 %if 0%{?fedora} || 0%{?rhel}
 Epoch:		2
 %endif
@ -184,7 +184,9 @@ BuildRequires:	snappy-devel
 BuildRequires:	sudo
 BuildRequires:	udev
 BuildRequires:	util-linux
+%ifarch %{valgrind_arches}
 BuildRequires:	valgrind-devel
+%endif
 BuildRequires:	which
 BuildRequires:	xfsprogs
 BuildRequires:	xfsprogs-devel
@ -1051,6 +1053,10 @@ export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"

+%ifarch riscv64
+export LDFLAGS="-latomic $LDFLAGS"
+%endif
+
 # Parallel build settings ...
 CEPH_MFLAGS_JOBS="%{?_smp_mflags}"
 CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//')
@ -2171,6 +2177,9 @@ exit 0


 %changelog
+* Thu Mar 21 2019 David Abdurachmanov <david.abdurachmanov@gmail.com> - 2:14.2.0-1.0.riscv64
+- Add support for RISC-V (riscv64)
+
 * Tue Mar 19 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 2:14.2.0-1
 - ceph 14.2.0 GA
Author	SHA1	Message	Date
David Abdurachmanov	fa9d1d9373	Attempt to have -latomic before -Wl,--as-needed Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2019-03-23 08:13:45 +01:00
David Abdurachmanov	fba2af6d40	Merge remote-tracking branch 'up/master' into master-riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2019-03-21 15:54:31 +01:00
David Abdurachmanov	0ebe4aa2de	Add -latomic to LDFLAGS on riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-05-03 18:53:00 +02:00
David Abdurachmanov	20d16f86ae	Use -j1 for riscv64 Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-05-03 09:09:56 +02:00
David Abdurachmanov	e9b20b4460	Mark riscv64 as lowmem_builder Even on SiFive board with 8G RAM + -j 4 we run out of memory killing the build. Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-05-02 23:48:35 +02:00
David Abdurachmanov	cfb1a6a701	Enable riscv64 Note that we disable tcmalloc, because it's not well tested at this point. Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>	2018-05-01 07:37:09 +02:00