aboutsummaryrefslogtreecommitdiff
path: root/databases/rocksdb/files
diff options
context:
space:
mode:
Diffstat (limited to 'databases/rocksdb/files')
-rw-r--r--databases/rocksdb/files/patch-Makefile11
-rw-r--r--databases/rocksdb/files/patch-port-port_posix.h27
-rw-r--r--databases/rocksdb/files/patch-util-env_posix.cc11
-rw-r--r--databases/rocksdb/files/patch-util-log_buffer.h10
4 files changed, 59 insertions, 0 deletions
diff --git a/databases/rocksdb/files/patch-Makefile b/databases/rocksdb/files/patch-Makefile
new file mode 100644
index 000000000000..a350a1f8b62f
--- /dev/null
+++ b/databases/rocksdb/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig 2014-06-20 07:40:32.000000000 +0800
++++ Makefile 2014-07-22 23:24:39.702518883 +0800
+@@ -166,7 +166,7 @@
+ release tags valgrind_check whitebox_crash_test format static_lib shared_lib all \
+ dbg
+
+-all: $(LIBRARY) $(PROGRAMS) $(TESTS)
++all: $(LIBRARY) $(PROGRAMS)
+
+ static_lib: $(LIBRARY)
+
diff --git a/databases/rocksdb/files/patch-port-port_posix.h b/databases/rocksdb/files/patch-port-port_posix.h
new file mode 100644
index 000000000000..480e0e49c7d6
--- /dev/null
+++ b/databases/rocksdb/files/patch-port-port_posix.h
@@ -0,0 +1,27 @@
+--- port/port_posix.h.orig 2014-06-20 07:40:32.000000000 +0800
++++ port/port_posix.h 2014-07-22 22:10:43.906820844 +0800
+@@ -26,10 +26,22 @@
+ #else
+ #define PLATFORM_IS_LITTLE_ENDIAN false
+ #endif
+-#elif defined(OS_FREEBSD) || defined(OS_OPENBSD) || defined(OS_NETBSD) ||\
+- defined(OS_DRAGONFLYBSD) || defined(OS_ANDROID)
++#elif defined(OS_FREEBSD)
+ #include <sys/types.h>
+ #include <sys/endian.h>
++ #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
++#elif defined(OS_OPENBSD) || defined(OS_NETBSD) ||\
++ defined(OS_DRAGONFLYBSD)
++ #include <sys/types.h>
++ #include <sys/endian.h>
++#elif defined(OS_HPUX)
++ #define PLATFORM_IS_LITTLE_ENDIAN false
++#elif defined(OS_ANDROID)
++ // Due to a bug in the NDK x86 <sys/endian.h> definition,
++ // _BYTE_ORDER must be used instead of __BYTE_ORDER on Android.
++ // See http://code.google.com/p/android/issues/detail?id=39824
++ #include <endian.h>
++ #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
+ #else
+ #include <endian.h>
+ #endif
diff --git a/databases/rocksdb/files/patch-util-env_posix.cc b/databases/rocksdb/files/patch-util-env_posix.cc
new file mode 100644
index 000000000000..0b6f85be128c
--- /dev/null
+++ b/databases/rocksdb/files/patch-util-env_posix.cc
@@ -0,0 +1,11 @@
+--- util/env_posix.cc.orig 2014-06-20 07:40:32.000000000 +0800
++++ util/env_posix.cc 2014-07-22 22:10:43.909825684 +0800
+@@ -1315,7 +1315,7 @@
+ }
+
+ virtual uint64_t NowNanos() {
+-#ifdef OS_LINUX
++#ifdef OS_FREEBSD
+ struct timespec ts;
+ clock_gettime(CLOCK_MONOTONIC, &ts);
+ return static_cast<uint64_t>(ts.tv_sec) * 1000000000 + ts.tv_nsec;
diff --git a/databases/rocksdb/files/patch-util-log_buffer.h b/databases/rocksdb/files/patch-util-log_buffer.h
new file mode 100644
index 000000000000..7046f34d3720
--- /dev/null
+++ b/databases/rocksdb/files/patch-util-log_buffer.h
@@ -0,0 +1,10 @@
+--- util/log_buffer.h.orig 2014-06-20 07:40:32.000000000 +0800
++++ util/log_buffer.h 2014-07-22 22:10:43.912828365 +0800
+@@ -5,6 +5,7 @@
+
+ #pragma once
+
++#include <sys/time.h>
+ #include "rocksdb/env.h"
+ #include "util/arena.h"
+ #include "util/autovector.h"