From 0a1a094308523e741ea94bb8ebd5057d0cb2c5c2 Mon Sep 17 00:00:00 2001 From: Jonny Heggheim Date: May 21 2022 11:51:51 +0000 Subject: Re-enabled armhfp --- diff --git a/armhfp-8609.patch b/armhfp-8609.patch new file mode 100644 index 0000000..2b7c6d4 --- /dev/null +++ b/armhfp-8609.patch @@ -0,0 +1,15 @@ +diff --git a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +index 37fde0323..dfc88b6f5 100644 +--- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h ++++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h +@@ -131,6 +131,10 @@ static inline tokutime_t toku_time_now(void) { + uint64_t result; + __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); + return result; ++#elif defined(__arm__) ++ uint32_t lo, hi; ++ __asm __volatile__("mrrc p15, 1, %[lo], %[hi], c14" : [ lo ] "=r" (lo), [hi] "=r" (hi)); ++ return (uint64_t)hi << 32 | lo; + #elif defined(__powerpc__) + return __ppc_get_timebase(); + #elif defined(__s390x__) diff --git a/rocksdb.spec b/rocksdb.spec index f343d31..7191258 100644 --- a/rocksdb.spec +++ b/rocksdb.spec @@ -2,16 +2,14 @@ Name: rocksdb Version: 7.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Persistent Key-Value Store for Flash and RAM Storage License: GPLv2 or ASL 2.0 and BSD URL: %{forgeurl} - -# Fails to build on armv7hl: -# https://bugzilla.redhat.com/show_bug.cgi?id=1997416 -ExcludeArch: armv7hl +# https://github.com/facebook/rocksdb/issues/8609#issuecomment-1009572506 +Patch0: armhfp-8609.patch BuildRequires: gcc-c++ BuildRequires: gflags-devel @@ -50,6 +48,8 @@ Development files for rocksdb. %prep %forgesetup +%patch0 -p1 + %build %cmake \ @@ -95,6 +95,9 @@ install -D -m 644 rocksdb.pc %{buildroot}%{_libdir}/pkgconfig/rocksdb.pc %changelog +* Sat May 21 2022 Jonny Heggheim - 7.2.2-3 +- Re-enabled armhfp + * Sat May 21 2022 Jonny Heggheim - 7.2.2-2 - Re-enabled x86