Add -stdlib=libc++ flag when building snappy

BASHO_RELEASES

@@ -1,3 +1,45 @@
+github.com tag 2.0.34 - February 15, 2017
+-----------------------------------------
+mv-hot-backup2:  - correct MakeTieredDbname() within db/filename.cc
+                   for case where dbname input is blank and fast/slow
+                   already populated in options.  Corrects issue
+                   with hot backup in non-tiered storage situations
+
+github.com tag 2.0.33 - November 21, 2016
+-----------------------------------------
+mv-bucket-expiry:  - partial branch to enable X-Riak-Meta-Expiry-Base-Seconds
+                     property within enterprise edition
+
+github.com tag 2.0.32 - November 8, 2016
+----------------------------------------
+ - version shipped with Riak 2.2
+** additional race condition hardening when faced with two threads on same iterator
+**  (one iterating async_iterator_move() and one closing async_iterator_close())
+ - wrap async_iterator_move operations with locked CloseMutex
+ - create and then use new manual SpinLock within RetrieveItrObject
+ - adapt origin spin lock code for Solaris / SmartOS compiling
+
+github.com tag 2.0.31 - November 1, 2016
+----------------------------------------
+ - includes leveldb 2.0.31 (mv-no-md-expiry & mv-tuning8)
+mv-ref-hardening:   - series of thread hardening changes
+                      related to AAE use of iterators. Biggest
+                      fix was isolating AAE using one thread to
+                      close while another was still moving, then
+                      defending against it
+
+github.com tag 2.0.30 - October 11, 2016
+----------------------------------------
+ - includes leveldb 2.0.30 (mv-delayed-bloom)
+
+github.com tag 2.0.28 - September 7, 2016
+-----------------------------------------
+Clarify which compression algorithm used for default:
+  1. leveldb open source users: lz4 default
+  2. eleveldb open source users: snappy default
+  3. riak.conf / app.config users of older generation: snappy default
+  4. riak.conf from Riak 2.2: lz4 default
+
 github.com tag 2.0.27 - August 22, 2016
 ---------------------------------------
 mv-mem-fences:  fix iterator double delete bug in eleveldb and

c_src/atoms.h

@@ -2,7 +2,7 @@
 //
 // eleveldb: Erlang Wrapper for LevelDB (http://code.google.com/p/leveldb/)
 //
-// Copyright (c) 2011-2013 Basho Technologies, Inc. All Rights Reserved.
+// Copyright (c) 2011-2017 Basho Technologies, Inc. All Rights Reserved.
 //
 // This file is provided to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file
@@ -23,9 +23,16 @@
 #ifndef ATOMS_H
 #define ATOMS_H
 
+extern "C" {
+
+#include "erl_nif.h"
+
+}
+
 namespace eleveldb {
 
 // Atoms (initialized in on_load)
+//   This is mirror of non-externs in eleveldb.cc
 extern ERL_NIF_TERM ATOM_TRUE;
 extern ERL_NIF_TERM ATOM_FALSE;
 extern ERL_NIF_TERM ATOM_OK;
@@ -35,15 +42,15 @@ extern ERL_NIF_TERM ATOM_BADARG;
 extern ERL_NIF_TERM ATOM_CREATE_IF_MISSING;
 extern ERL_NIF_TERM ATOM_ERROR_IF_EXISTS;
 extern ERL_NIF_TERM ATOM_WRITE_BUFFER_SIZE;
-extern ERL_NIF_TERM ATOM_MAX_OPEN_FILES;
-extern ERL_NIF_TERM ATOM_BLOCK_SIZE;                    /* DEPRECATED */
 extern ERL_NIF_TERM ATOM_SST_BLOCK_SIZE;
+extern ERL_NIF_TERM ATOM_BLOCK_SIZE_STEPS;
 extern ERL_NIF_TERM ATOM_BLOCK_RESTART_INTERVAL;
 extern ERL_NIF_TERM ATOM_ERROR_DB_OPEN;
 extern ERL_NIF_TERM ATOM_ERROR_DB_PUT;
 extern ERL_NIF_TERM ATOM_NOT_FOUND;
 extern ERL_NIF_TERM ATOM_VERIFY_CHECKSUMS;
 extern ERL_NIF_TERM ATOM_FILL_CACHE;
+extern ERL_NIF_TERM ATOM_ITERATOR_REFRESH;
 extern ERL_NIF_TERM ATOM_SYNC;
 extern ERL_NIF_TERM ATOM_ERROR_DB_DELETE;
 extern ERL_NIF_TERM ATOM_CLEAR;
@@ -57,15 +64,45 @@ extern ERL_NIF_TERM ATOM_FIRST;
 extern ERL_NIF_TERM ATOM_LAST;
 extern ERL_NIF_TERM ATOM_NEXT;
 extern ERL_NIF_TERM ATOM_PREV;
+extern ERL_NIF_TERM ATOM_PREFETCH;
+extern ERL_NIF_TERM ATOM_PREFETCH_STOP;
 extern ERL_NIF_TERM ATOM_INVALID_ITERATOR;
-extern ERL_NIF_TERM ATOM_CACHE_SIZE;
 extern ERL_NIF_TERM ATOM_PARANOID_CHECKS;
+extern ERL_NIF_TERM ATOM_VERIFY_COMPACTIONS;
 extern ERL_NIF_TERM ATOM_ERROR_DB_DESTROY;
 extern ERL_NIF_TERM ATOM_KEYS_ONLY;
 extern ERL_NIF_TERM ATOM_COMPRESSION;
+extern ERL_NIF_TERM ATOM_ON;
+extern ERL_NIF_TERM ATOM_OFF;
+extern ERL_NIF_TERM ATOM_SNAPPY;
+extern ERL_NIF_TERM ATOM_LZ4;
 extern ERL_NIF_TERM ATOM_ERROR_DB_REPAIR;
 extern ERL_NIF_TERM ATOM_USE_BLOOMFILTER;
-
+extern ERL_NIF_TERM ATOM_TOTAL_MEMORY;
+extern ERL_NIF_TERM ATOM_TOTAL_LEVELDB_MEM;
+extern ERL_NIF_TERM ATOM_TOTAL_LEVELDB_MEM_PERCENT;
+extern ERL_NIF_TERM ATOM_BLOCK_CACHE_THRESHOLD;
+extern ERL_NIF_TERM ATOM_IS_INTERNAL_DB;
+extern ERL_NIF_TERM ATOM_LIMITED_DEVELOPER_MEM;
+extern ERL_NIF_TERM ATOM_ELEVELDB_THREADS;
+extern ERL_NIF_TERM ATOM_FADVISE_WILLNEED;
+extern ERL_NIF_TERM ATOM_DELETE_THRESHOLD;
+extern ERL_NIF_TERM ATOM_TIERED_SLOW_LEVEL;
+extern ERL_NIF_TERM ATOM_TIERED_FAST_PREFIX;
+extern ERL_NIF_TERM ATOM_TIERED_SLOW_PREFIX;
+extern ERL_NIF_TERM ATOM_CACHE_OBJECT_WARMING;
+extern ERL_NIF_TERM ATOM_EXPIRATION;
+extern ERL_NIF_TERM ATOM_DEFAULT_TIME_TO_LIVE;
+extern ERL_NIF_TERM ATOM_EXPIRATION_MODE;
+extern ERL_NIF_TERM ATOM_ENABLED;
+extern ERL_NIF_TERM ATOM_WHOLE_FILE;
+extern ERL_NIF_TERM ATOM_PER_ITEM;
+extern ERL_NIF_TERM ATOM_INVOKE;
+extern ERL_NIF_TERM ATOM_UNLIMITED;
+extern ERL_NIF_TERM ATOM_EXPIRY_ENABLED;
+extern ERL_NIF_TERM ATOM_EXPIRY_MINUTES;
+extern ERL_NIF_TERM ATOM_WHOLE_FILE_EXPIRY;
+extern ERL_NIF_TERM ATOM_BUCKET_PROPS;
 }   // namespace eleveldb
 
 

c_src/build_deps.sh

@@ -65,13 +65,15 @@ case "$1" in
         ;;
 
     *)
+        export MACOSX_DEPLOYMENT_TARGET=10.8
+
         if [ ! -d snappy-$SNAPPY_VSN ]; then
             tar -xzf snappy-$SNAPPY_VSN.tar.gz
-            (cd snappy-$SNAPPY_VSN && ./configure --prefix=$BASEDIR/system --libdir=$BASEDIR/system/lib --with-pic)
+            (cd snappy-$SNAPPY_VSN && ./configure --disable-shared --prefix=$BASEDIR/system --libdir=$BASEDIR/system/lib --with-pic)
         fi
 
         if [ ! -f system/lib/libsnappy.a ]; then
-            (cd snappy-$SNAPPY_VSN && $MAKE && $MAKE install)
+            (cd snappy-$SNAPPY_VSN && $MAKE -stdlib=libc++ && $MAKE -stdlib=libc++ install)
         fi
 
         export CFLAGS="$CFLAGS -I $BASEDIR/system/include"