Attachment 160930 Details for Bug 203043 – shar

shar

rethinkdb.shar (text/plain), 19.54 KB, created by Kurt Jaeger on 2015-09-11 15:19:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2015-09-11 15:19:18 UTC

Size: 19.54 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	rethinkdb/Makefile
>#	rethinkdb/pkg-descr
>#	rethinkdb/distinfo
>#	rethinkdb/files/patch-src_extproc_extproc__spawner.cc
>#	rethinkdb/files/patch-mk_support_pkg_pkg.sh
>#	rethinkdb/files/patch-src_parsing_util.cc
>#	rethinkdb/files/patch-src_clustering_administration_main_cache__size.cc
>#	rethinkdb/files/extra-patch-config.mk
>#	rethinkdb/files/patch-src_containers_printf__buffer.cc
>#	rethinkdb/files/patch-external_v8__3.30.33.16_src_preparser.h
>#	rethinkdb/files/patch-src_arch_runtime_thread__pool.cc
>#	rethinkdb/files/patch-external_v8__3.30.33.16_build_gyp_gyp
>#	rethinkdb/files/patch-src_arch_io_disk_filestat.cc
>#	rethinkdb/files/patch-src_threading.hpp
>#	rethinkdb/files/patch-src_arch_io_io__utils.cc
>#	rethinkdb/files/patch-external_v8__3.30.33.16_src_unique.h
>#	rethinkdb/files/patch-src_arch_runtime_context__switching.cc
>#	rethinkdb/files/patch-src_arch_io_timer__provider.hpp
>#	rethinkdb/files/patch-src_rdb__protocol_geo_s2_base_port.h
>#	rethinkdb/files/patch-src_build.mk
>#	rethinkdb/files/patch-configure
>#	rethinkdb/files/patch-src_rdb__protocol_geo_s2_util_math_exactfloat_exactfloat.cc
>#	rethinkdb/files/patch-src_extproc_extproc__worker.cc
>#	rethinkdb/files/patch-src_errors.hpp
>#	rethinkdb/files/patch-src_arch_io_timer_timerfd__provider.cc
>#	rethinkdb/files/patch-src_arch_io_disk.cc
>#	rethinkdb/files/patch-external_v8__3.30.33.16_src_debug.cc
>#
>echo x - rethinkdb/Makefile
>sed 's/^X//' >rethinkdb/Makefile << 'a22ae250770d30bdc9615c29b6a81831'
>X# $FreeBSD$
>X
>XPORTNAME=	rethinkdb
>XPORTVERSION=	2.1.3
>XCATEGORIES=	databases
>XMASTER_SITES=	http://download.rethinkdb.com/dist/
>X
>XMAINTAINER=	pi@FreeBSD.org
>XCOMMENT=	Scalable JSON database for the realtime web
>X
>XLICENSE=	AGPLv3
>XLICENSE_FILE=	${WRKSRC}/COPYRIGHT
>X
>XLIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf \
>X		libboost_system.so:${PORTSDIR}/devel/boost-libs \
>X		libcurl.so:${PORTSDIR}/ftp/curl \
>X		libcrypto.so:${PORTSDIR}/security/openssl
>X
>XMAKE_JOBS_UNSAFE=yes
>XMAKE_ENV+=	VERBOSE=1
>X
>XUSES=		gmake python:2 tar:tgz
>X
>Xdo-configure:
>X	cd ${WRKSRC} && \
>X		CXXFLAGS=-I${LOCALBASE}/include \
>X		CFLAGS=-I${LOCALBASE}/include \
>X		LDFLAGS=-L${LOCALBASE}/lib \
>X		./configure --with-system-malloc
>X	cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/extra-patch-config.mk
>X
>X.include <bsd.port.mk>
>a22ae250770d30bdc9615c29b6a81831
>echo x - rethinkdb/pkg-descr
>sed 's/^X//' >rethinkdb/pkg-descr << '1212519985df8352a3fb1f1f9a91b7b4'
>XRethinkDB is a open-source, scalable JSON database for the realtime
>Xweb. It inverts the traditional database architecture by providing
>Xa new access model - instead of polling for changes, the developer
>Xcan tell RethinkDB to continuously push updated query results to
>Xapplications in realtime.
>X
>XWWW: http://www.rethinkdb.com/
>1212519985df8352a3fb1f1f9a91b7b4
>echo x - rethinkdb/distinfo
>sed 's/^X//' >rethinkdb/distinfo << '3b9b6cc973a17db78ee7049a565adf9d'
>XSHA256 (rethinkdb-2.1.3.tgz) = 8dbfbd89e1053eda7acde7e0bb9c4ceb64c5371ceb9b3e16019e6fc60776890f
>XSIZE (rethinkdb-2.1.3.tgz) = 27568419
>3b9b6cc973a17db78ee7049a565adf9d
>echo x - rethinkdb/files/patch-src_extproc_extproc__spawner.cc
>sed 's/^X//' >rethinkdb/files/patch-src_extproc_extproc__spawner.cc << '218bae850bdcd24aa9aa3f9d8fe58524'
>X--- src/extproc/extproc_spawner.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/extproc/extproc_spawner.cc
>X@@ -218,7 +218,7 @@ fd_t extproc_spawner_t::spawn(object_buf
>X     res = send_fds(spawner_socket.get(), 1, &fds[1]);
>X     guarantee_err(res == 0, "could not send socket file descriptor to worker process");
>X 
>X-    stream_out->create(fds[0], reinterpret_cast<fd_watcher_t*>(NULL));
>X+    stream_out->create(fds[0], NULL);
>X 
>X     // Get the pid of the new worker process
>X     archive_result_t archive_res;
>218bae850bdcd24aa9aa3f9d8fe58524
>echo x - rethinkdb/files/patch-mk_support_pkg_pkg.sh
>sed 's/^X//' >rethinkdb/files/patch-mk_support_pkg_pkg.sh << 'b069adc2f37c872f2d8268ad746ab3bf'
>X--- mk/support/pkg/pkg.sh.orig	2015-09-11 14:26:39 UTC
>X+++ mk/support/pkg/pkg.sh
>X@@ -143,7 +143,7 @@ pkg_configure () {
>X }
>X 
>X pkg_make () {
>X-    in_dir "$build_dir" make "$@"
>X+    in_dir "$build_dir" gmake "$@"
>X }
>X 
>X pkg_install () {
>b069adc2f37c872f2d8268ad746ab3bf
>echo x - rethinkdb/files/patch-src_parsing_util.cc
>sed 's/^X//' >rethinkdb/files/patch-src_parsing_util.cc << 'b80ce3fda85d9baaec2f7c694fa521b2'
>X--- src/parsing/util.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/parsing/util.cc
>X@@ -1,7 +1,9 @@
>X // Copyright 2010-2012 RethinkDB, all rights reserved.
>X #include "parsing/util.hpp"
>X 
>X+#ifndef __FreeBSD__
>X #include <alloca.h>
>X+#endif
>X 
>X #include "arch/io/network.hpp"
>X 
>b80ce3fda85d9baaec2f7c694fa521b2
>echo x - rethinkdb/files/patch-src_clustering_administration_main_cache__size.cc
>sed 's/^X//' >rethinkdb/files/patch-src_clustering_administration_main_cache__size.cc << '972cda8c8e3eaad3d702fca4a6883caa'
>X--- src/clustering/administration/main/cache_size.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/clustering/administration/main/cache_size.cc
>X@@ -180,7 +180,11 @@ uint64_t get_avail_mem_size() {
>X                 "as if it were unavailable.");
>X 
>X             // This just returns what /proc/meminfo would report as "MemFree".
>X+#ifdef __FreeBSD__
>X+            uint64_t avail_mem_pages = sysconf(_SC_PHYS_PAGES);
>X+#else
>X             uint64_t avail_mem_pages = sysconf(_SC_AVPHYS_PAGES);
>X+#endif
>X             return avail_mem_pages * page_size;
>X         }
>X     }
>972cda8c8e3eaad3d702fca4a6883caa
>echo x - rethinkdb/files/extra-patch-config.mk
>sed 's/^X//' >rethinkdb/files/extra-patch-config.mk << 'ebdbf61461ac2710ddd7c3500f64db48'
>X--- config.mk.orig	2015-09-11 16:29:03.936294000 +0200
>X+++ config.mk	2015-09-11 12:06:59.242602000 +0200
>X@@ -28,6 +28,8 @@
>X GCC_ARCH_REDUCED := amd64
>X # stdlib
>X LDFLAGS += -lstdc++
>X+CXXFLAGS += -I/usr/local/include
>X+CFLAGS += -I/usr/local/include
>X # C++11
>X CXX11_LIBS += 
>X HAS_CXX11 := 1
>ebdbf61461ac2710ddd7c3500f64db48
>echo x - rethinkdb/files/patch-src_containers_printf__buffer.cc
>sed 's/^X//' >rethinkdb/files/patch-src_containers_printf__buffer.cc << '8acf9727bde0cddcbc755cb2156173fe'
>X--- src/containers/printf_buffer.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/containers/printf_buffer.cc
>X@@ -1,4 +1,5 @@
>X // Copyright 2010-2013 RethinkDB, all rights reserved.
>X+#include <sys/types.h>
>X #include "containers/printf_buffer.hpp"
>X #include "math.hpp"
>X 
>8acf9727bde0cddcbc755cb2156173fe
>echo x - rethinkdb/files/patch-external_v8__3.30.33.16_src_preparser.h
>sed 's/^X//' >rethinkdb/files/patch-external_v8__3.30.33.16_src_preparser.h << 'bb7e149ce2d21d3701e444017581b458'
>X--- external/v8_3.30.33.16/src/preparser.h.orig	2015-09-11 14:26:39 UTC
>X+++ external/v8_3.30.33.16/src/preparser.h
>X@@ -437,7 +437,7 @@ class ParserBase : public Traits {
>X   void ReportMessageAt(Scanner::Location location, const char* message,
>X                        bool is_reference_error = false) {
>X     Traits::ReportMessageAt(location, message,
>X-                            reinterpret_cast<const char*>(NULL),
>X+                            NULL,
>X                             is_reference_error);
>X   }
>X 
>bb7e149ce2d21d3701e444017581b458
>echo x - rethinkdb/files/patch-src_arch_runtime_thread__pool.cc
>sed 's/^X//' >rethinkdb/files/patch-src_arch_runtime_thread__pool.cc << '5ea58d7a6297f771690d81a2ac635882'
>X--- src/arch/runtime/thread_pool.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/arch/runtime/thread_pool.cc
>X@@ -122,7 +122,7 @@ void *linux_thread_pool_t::start_thread(
>X         backtrace for us. */
>X #ifndef VALGRIND
>X         stack_t signal_stack;
>X-        signal_stack.ss_sp = malloc_aligned(SIGNAL_HANDLER_STACK_SIZE, getpagesize());
>X+        signal_stack.ss_sp = (char *)malloc_aligned(SIGNAL_HANDLER_STACK_SIZE, getpagesize());
>X         signal_stack.ss_flags = 0;
>X         signal_stack.ss_size = SIGNAL_HANDLER_STACK_SIZE;
>X         int res = sigaltstack(&signal_stack, NULL);
>5ea58d7a6297f771690d81a2ac635882
>echo x - rethinkdb/files/patch-external_v8__3.30.33.16_build_gyp_gyp
>sed 's/^X//' >rethinkdb/files/patch-external_v8__3.30.33.16_build_gyp_gyp << '53fded661838a0c7e5c49d61c50db391'
>X--- external/v8_3.30.33.16/build/gyp/gyp.orig	2015-09-11 14:26:39 UTC
>X+++ external/v8_3.30.33.16/build/gyp/gyp
>X@@ -1,4 +1,4 @@
>X-#!/bin/bash
>X+#!/usr/local/bin/bash
>X # Copyright 2013 The Chromium Authors. All rights reserved.
>X # Use of this source code is governed by a BSD-style license that can be
>X # found in the LICENSE file.
>53fded661838a0c7e5c49d61c50db391
>echo x - rethinkdb/files/patch-src_arch_io_disk_filestat.cc
>sed 's/^X//' >rethinkdb/files/patch-src_arch_io_disk_filestat.cc << 'f8014a18381221997e568662062c9cad'
>X--- src/arch/io/disk/filestat.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/arch/io/disk/filestat.cc
>X@@ -7,7 +7,7 @@
>X int64_t get_file_size(int fd) {
>X     guarantee(fd != -1);
>X 
>X-#ifdef __MACH__
>X+#if defined(__MACH__) || defined(__FreeBSD__)
>X     struct stat buf;
>X     int res = fstat(fd, &buf);
>X #else
>f8014a18381221997e568662062c9cad
>echo x - rethinkdb/files/patch-src_threading.hpp
>sed 's/^X//' >rethinkdb/files/patch-src_threading.hpp << 'a613bd34af34a622bb7d96bd08a1039a'
>X--- src/threading.hpp.orig	2015-09-11 14:26:39 UTC
>X+++ src/threading.hpp
>X@@ -1,6 +1,7 @@
>X #ifndef THREADING_HPP_
>X #define THREADING_HPP_
>X 
>X+#include <sys/types.h>
>X #include "errors.hpp"
>X 
>X // A thread number as used by the thread pool.
>a613bd34af34a622bb7d96bd08a1039a
>echo x - rethinkdb/files/patch-src_arch_io_io__utils.cc
>sed 's/^X//' >rethinkdb/files/patch-src_arch_io_io__utils.cc << 'ab21513d3f1ecb8dc8ae6bb16f25acbb'
>X--- src/arch/io/io_utils.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/arch/io/io_utils.cc
>X@@ -8,9 +8,11 @@
>X 
>X #include "logger.hpp"
>X 
>X+#if 0
>X int _gettid() {
>X     return syscall(SYS_gettid);
>X }
>X+#endif
>X 
>X fd_t scoped_fd_t::reset(fd_t f2) {
>X     if (fd != INVALID_FD) {
>ab21513d3f1ecb8dc8ae6bb16f25acbb
>echo x - rethinkdb/files/patch-external_v8__3.30.33.16_src_unique.h
>sed 's/^X//' >rethinkdb/files/patch-external_v8__3.30.33.16_src_unique.h << '650343715cb5b07ddb780f17ad6aee9e'
>X--- external/v8_3.30.33.16/src/unique.h.orig	2015-09-11 14:26:39 UTC
>X+++ external/v8_3.30.33.16/src/unique.h
>X@@ -117,7 +117,7 @@ class Unique {
>X 
>X   // TODO(titzer): this is a hack to migrate to Unique<T> incrementally.
>X   static Unique<T> CreateUninitialized(Handle<T> handle) {
>X-    return Unique<T>(reinterpret_cast<Address>(NULL), handle);
>X+    return Unique<T>(NULL, handle);
>X   }
>X 
>X   static Unique<T> CreateImmovable(Handle<T> handle) {
>650343715cb5b07ddb780f17ad6aee9e
>echo x - rethinkdb/files/patch-src_arch_runtime_context__switching.cc
>sed 's/^X//' >rethinkdb/files/patch-src_arch_runtime_context__switching.cc << '36ba9797661790ebdda5deb727cdf7d6'
>X--- src/arch/runtime/context_switching.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/arch/runtime/context_switching.cc
>X@@ -1,6 +1,10 @@
>X // Copyright 2010-2014 RethinkDB, all rights reserved.
>X #include "arch/runtime/context_switching.hpp"
>X 
>X+#ifdef __FreeBSD__
>X+#include <pthread_np.h>
>X+#endif
>X+
>X #include <pthread.h>
>X #include <sys/mman.h>
>X #include <unistd.h>
>X@@ -544,7 +548,11 @@ void threaded_stack_t::get_stack_addr_si
>X #else
>X     // Implementation for Linux
>X     pthread_attr_t attr;
>X+#ifdef __FreeBSD__
>X+    int res = pthread_attr_get_np(thread, &attr);
>X+#else
>X     int res = pthread_getattr_np(thread, &attr);
>X+#endif
>X     guarantee_xerr(res == 0, res, "Unable to get pthread attributes");
>X     res = pthread_attr_getstack(&attr, stackaddr_out, stacksize_out);
>X     guarantee_xerr(res == 0, res, "Unable to get pthread stack attribute");
>36ba9797661790ebdda5deb727cdf7d6
>echo x - rethinkdb/files/patch-src_arch_io_timer__provider.hpp
>sed 's/^X//' >rethinkdb/files/patch-src_arch_io_timer__provider.hpp << '97db5b9a770d3f646427705d307025b9'
>X--- src/arch/io/timer_provider.hpp.orig	2015-09-11 14:26:39 UTC
>X+++ src/arch/io/timer_provider.hpp
>X@@ -17,7 +17,7 @@
>X #ifdef LEGACY_LINUX
>X #define RDB_TIMER_PROVIDER RDB_TIMER_PROVIDER_SIGNAL
>X #else
>X-#ifdef __MACH__
>X+#if defined(__MACH__) || defined(__FreeBSD)
>X #define RDB_TIMER_PROVIDER RDB_TIMER_PROVIDER_KQUEUE
>X #else
>X #define RDB_TIMER_PROVIDER RDB_TIMER_PROVIDER_TIMERFD
>97db5b9a770d3f646427705d307025b9
>echo x - rethinkdb/files/patch-src_rdb__protocol_geo_s2_base_port.h
>sed 's/^X//' >rethinkdb/files/patch-src_rdb__protocol_geo_s2_base_port.h << 'fab83842fc6ebde17d73600d2c9e7f31'
>X--- src/rdb_protocol/geo/s2/base/port.h.orig	2015-09-11 14:26:39 UTC
>X+++ src/rdb_protocol/geo/s2/base/port.h
>X@@ -115,6 +115,13 @@ typedef uint16_t u_int16_t;
>X #define bswap_32(x) OSSwapInt32(x)
>X #define bswap_64(x) OSSwapInt64(x)
>X 
>X+#elif defined(__FreeBSD__)
>X+// FreeBSD
>X+#include <sys/endian.h>
>X+#define bswap_16(x) bswap16(x)
>X+#define bswap_32(x) bswap32(x)
>X+#define bswap_64(x) bswap64(x)
>X+
>X #else
>X #include <byteswap.h>
>X #endif
>fab83842fc6ebde17d73600d2c9e7f31
>echo x - rethinkdb/files/patch-src_build.mk
>sed 's/^X//' >rethinkdb/files/patch-src_build.mk << '1ff96b3f91ea4b8b48a16824fe7568d5'
>X--- src/build.mk.orig	2015-09-11 14:26:39 UTC
>X+++ src/build.mk
>X@@ -107,7 +107,7 @@ endif
>X 
>X 
>X ifneq (1,$(ALLOW_WARNINGS))
>X-  RT_CXXFLAGS += -Werror
>X+  RT_CXXFLAGS += 
>X endif
>X 
>X RT_CXXFLAGS += -Wnon-virtual-dtor -Wno-deprecated-declarations -std=gnu++0x
>X@@ -117,7 +117,7 @@ ifeq ($(COMPILER), INTEL)
>X 
>X else ifeq ($(COMPILER), CLANG)
>X   RT_CXXFLAGS += -Wformat=2 -Wswitch-enum -Wswitch-default # -Wno-unneeded-internal-declaration
>X-  RT_CXXFLAGS += -Wused-but-marked-unused -Wundef -Wvla -Wshadow
>X+  RT_CXXFLAGS += -Wvla -Wshadow
>X   RT_CXXFLAGS += -Wconditional-uninitialized -Wmissing-noreturn
>X else ifeq ($(COMPILER), GCC)
>X   ifeq ($(LEGACY_GCC), 1)
>1ff96b3f91ea4b8b48a16824fe7568d5
>echo x - rethinkdb/files/patch-configure
>sed 's/^X//' >rethinkdb/files/patch-configure << 'e10cdaf9f55706379abcc8df0c12c086'
>X--- configure.orig	2015-09-11 14:26:39 UTC
>X+++ configure
>X@@ -66,6 +66,11 @@ configure () {
>X     check_cross_compiling
>X     require "Host Operating System"
>X     case "${MACHINE#*-}" in
>X+        *freebsd*)
>X+            var OS "FreeBSD"
>X+            default_allocator=$default_allocator_linux
>X+            var PTHREAD_LIBS "" ;
>X+            var RT_LIBS "" ;;
>X         *apple-darwin*)
>X             var OS "Darwin"
>X             default_allocator=$default_allocator_osx
>e10cdaf9f55706379abcc8df0c12c086
>echo x - rethinkdb/files/patch-src_rdb__protocol_geo_s2_util_math_exactfloat_exactfloat.cc
>sed 's/^X//' >rethinkdb/files/patch-src_rdb__protocol_geo_s2_util_math_exactfloat_exactfloat.cc << '8f9eca599fb6481c7ffdfe5b87896017'
>X--- src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
>X@@ -20,7 +20,7 @@ using std::reverse;
>X using std::numeric_limits;
>X 
>X #ifndef __APPLE__
>X-using std::signbit;
>X+/* using std::signbit; */
>X #endif
>X 
>X 
>8f9eca599fb6481c7ffdfe5b87896017
>echo x - rethinkdb/files/patch-src_extproc_extproc__worker.cc
>sed 's/^X//' >rethinkdb/files/patch-src_extproc_extproc__worker.cc << 'ffa2e9b7969d8442f971c2a337a170f4'
>X--- src/extproc/extproc_worker.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/extproc/extproc_worker.cc
>X@@ -29,7 +29,7 @@ extproc_worker_t::extproc_worker_t(extpr
>X 
>X extproc_worker_t::~extproc_worker_t() {
>X     if (worker_pid != -1) {
>X-        socket_stream.create(socket.get(), reinterpret_cast<fd_watcher_t*>(NULL));
>X+        socket_stream.create(socket.get(), NULL);
>X 
>X         try {
>X             run_job(&worker_exit_fn);
>X@@ -61,7 +61,7 @@ void extproc_worker_t::acquired(signal_t
>X     if (worker_pid == -1) {
>X         socket.reset(spawner->spawn(&socket_stream, &worker_pid));
>X     } else {
>X-        socket_stream.create(socket.get(), reinterpret_cast<fd_watcher_t*>(NULL));
>X+        socket_stream.create(socket.get(), NULL);
>X     }
>X 
>X     // Apply the user interruptor to our stream along with the extproc pool's interruptor
>ffa2e9b7969d8442f971c2a337a170f4
>echo x - rethinkdb/files/patch-src_errors.hpp
>sed 's/^X//' >rethinkdb/files/patch-src_errors.hpp << 'c3a4c5239fd880d176a40e370b192cc7'
>X--- src/errors.hpp.orig	2015-09-11 14:26:39 UTC
>X+++ src/errors.hpp
>X@@ -7,7 +7,7 @@
>X #include <stdlib.h>
>X 
>X #ifndef DISABLE_BREAKPOINTS
>X-#ifdef __linux__
>X+#if defined __linux__ || defined __FreeBSD__
>X #if defined __i386 || defined __x86_64
>X #define BREAKPOINT __asm__ volatile ("int3")
>X #else   /* not x86/amd64 */
>c3a4c5239fd880d176a40e370b192cc7
>echo x - rethinkdb/files/patch-src_arch_io_timer_timerfd__provider.cc
>sed 's/^X//' >rethinkdb/files/patch-src_arch_io_timer_timerfd__provider.cc << 'd8892ba5abbf560f8081ac3fad15eae0'
>X--- src/arch/io/timer/timerfd_provider.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/arch/io/timer/timerfd_provider.cc
>X@@ -2,6 +2,7 @@
>X #include "arch/io/timer_provider.hpp"
>X 
>X #if RDB_TIMER_PROVIDER == RDB_TIMER_PROVIDER_TIMERFD
>X+#ifndef __FreeBSD__
>X 
>X #include <fcntl.h>  // NOLINT(build/include_order)
>X #include <unistd.h>  // NOLINT(build/include_order)
>X@@ -86,4 +87,5 @@ void timerfd_provider_t::on_event(int ev
>X     }
>X }
>X 
>X+#endif
>X #endif  // RDB_TIMER_PROVIDER == RDB_TIMER_PROVIDER_TIMERFD
>d8892ba5abbf560f8081ac3fad15eae0
>echo x - rethinkdb/files/patch-src_arch_io_disk.cc
>sed 's/^X//' >rethinkdb/files/patch-src_arch_io_disk.cc << '2531386c1f6eeec0f3f85afff0588756'
>X--- src/arch/io/disk.cc.orig	2015-09-11 14:26:39 UTC
>X+++ src/arch/io/disk.cc
>X@@ -421,8 +421,10 @@ file_open_result_t open_file(const char 
>X     // For now, we have a whitelist of kernels that don't support O_LARGEFILE.  Linux is
>X     // the only known kernel that has (or may need) the O_LARGEFILE flag.
>X #ifndef __MACH__
>X+#ifndef __FreeBSD__
>X     flags |= O_LARGEFILE;
>X #endif
>X+#endif
>X 
>X     if ((mode & linux_file_t::mode_write) && (mode & linux_file_t::mode_read)) {
>X         flags |= O_RDWR;
>X@@ -471,6 +473,8 @@ file_open_result_t open_file(const char 
>X                                     static_cast<long>(flags | O_DIRECT));  // NOLINT(runtime/int)
>X #elif defined(__APPLE__)
>X         const int fcntl_res = fcntl(fd.get(), F_NOCACHE, 1);
>X+#elif defined(__FreeBSD__)
>X+        const int fcntl_res = fcntl(fd.get(), F_SETFL, O_DIRECT);
>X #else
>X #error "Figure out how to do direct I/O and fsync correctly (despite your operating system's lies) on your platform."
>X #endif  // __linux__, defined(__APPLE__)
>X@@ -561,7 +565,7 @@ int perform_datasync(fd_t fd) {
>X     // On OS X, we use F_FULLFSYNC because fsync lies.  fdatasync is not available.  On
>X     // Linux we just use fdatasync.
>X 
>X-#ifdef __MACH__
>X+#if defined(__MACH__)
>X 
>X     int fcntl_res;
>X     do {
>X@@ -570,6 +574,15 @@ int perform_datasync(fd_t fd) {
>X 
>X     return fcntl_res == -1 ? get_errno() : 0;
>X 
>X+#elif defined(__FreeBSD__)
>X+
>X+    int fcntl_res;
>X+    do {
>X+        fcntl_res = fsync(fd);
>X+    } while (fcntl_res == -1 && get_errno() == EINTR);
>X+
>X+    return fcntl_res == -1 ? get_errno() : 0;
>X+
>X #else  // __MACH__
>X 
>X     int res = fdatasync(fd);
>2531386c1f6eeec0f3f85afff0588756
>echo x - rethinkdb/files/patch-external_v8__3.30.33.16_src_debug.cc
>sed 's/^X//' >rethinkdb/files/patch-external_v8__3.30.33.16_src_debug.cc << 'bced4c3f50ae0730d41a5b9440932c48'
>X--- external/v8_3.30.33.16/src/debug.cc.orig	2015-09-11 14:26:39 UTC
>X+++ external/v8_3.30.33.16/src/debug.cc
>X@@ -564,8 +564,7 @@ void Debug::ThreadInit() {
>X   thread_local_.step_into_fp_ = 0;
>X   thread_local_.step_out_fp_ = 0;
>X   // TODO(isolates): frames_are_dropped_?
>X-  base::NoBarrier_Store(&thread_local_.current_debug_scope_,
>X-                        static_cast<base::AtomicWord>(NULL));
>X+  base::NoBarrier_Store(&thread_local_.current_debug_scope_,0);
>X   thread_local_.restarter_frame_function_pointer_ = NULL;
>X }
>X 
>bced4c3f50ae0730d41a5b9440932c48
>exit
>

Actions: View

Attachments on bug 203043: 160930 | 160942 | 160949 | 161007 | 161139 | 161162 | 161299 | 161302 | 161400 | 174373