diff --git a/srcpkgs/rocksdb/patches/toku_time.patch b/srcpkgs/rocksdb/patches/toku_time.patch index 9ffe1390ed1..59f0a5c84fd 100644 --- a/srcpkgs/rocksdb/patches/toku_time.patch +++ b/srcpkgs/rocksdb/patches/toku_time.patch @@ -1,10 +1,16 @@ -From: https://github.com/facebook/rocksdb/issues/8609 - -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 225e3fa72..cd5f935f1 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) { +@@ -58,9 +58,6 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. + #include + #include + #include +-#if defined(__powerpc__) +-#include +-#endif + + #if 0 + static inline float toku_tdiff (struct timeval *a, struct timeval *b) { +@@ -131,8 +128,12 @@ static inline tokutime_t toku_time_now(void) { uint64_t result; __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); return result; @@ -13,5 +19,8 @@ index 225e3fa72..cd5f935f1 100644 + __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(); +- return __ppc_get_timebase(); ++ return __builtin_ppc_get_timebase(); #elif defined(__s390x__) + uint64_t result; + asm volatile("stckf %0" : "=Q"(result) : : "cc"); diff --git a/srcpkgs/rocksdb/template b/srcpkgs/rocksdb/template index e2ef6f916c0..54921221469 100644 --- a/srcpkgs/rocksdb/template +++ b/srcpkgs/rocksdb/template @@ -17,6 +17,10 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi +if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then + broken="assembler errors" +fi + post_install() { vcopy "include/rocksdb/*" usr/include/rocksdb vlicense LICENSE.leveldb