[Pkg-javascript-commits] [node-leveldown] 475/492: make rocksdb compile on osx

[Andrew Kelley]

This is an automated email from the git hooks/post-receive script.

andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.

commit 0c39686332d6fc8e5792c5960180f41f09e0b6eb
Author: Rod Vagg <rod at vagg.org>
Date:   Tue Nov 19 15:43:22 2013 +1100

    make rocksdb compile on osx
---
 binding.gyp                                        | 14 ++++++++++++++
 deps/leveldb/leveldb-rocksdb/util/build_version.cc |  4 ++--
 deps/leveldb/leveldb.gyp                           | 11 ++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 73e3795..40ad1d8 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -39,6 +39,20 @@
                   '-Wno-unused-local-typedefs'
               ]
           }]
+        , ['OS == "mac"', {
+              'xcode_settings': {
+                  'WARNING_CFLAGS': [
+                     '-Wno-ignored-qualifiers'
+                  ]
+                , 'OTHER_CPLUSPLUSFLAGS': [
+                      '-mmacosx-version-min=10.7'
+                    , '-std=c++11'
+                    , '-stdlib=libc++'
+                  ]
+                , 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
+                , 'MACOSX_DEPLOYMENT_TARGET': '10.7'
+              }
+          }]
         ]
       , "dependencies": [
             "<(module_root_dir)/deps/leveldb/leveldb.gyp:leveldb"
diff --git a/deps/leveldb/leveldb-rocksdb/util/build_version.cc b/deps/leveldb/leveldb-rocksdb/util/build_version.cc
index 0b9c2f0..43626d8 100644
--- a/deps/leveldb/leveldb-rocksdb/util/build_version.cc
+++ b/deps/leveldb/leveldb-rocksdb/util/build_version.cc
@@ -1,6 +1,6 @@
 #include "build_version.h"
 
-const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:a0ce3fd00a1ae35bcbb9edc603b7398d83a8eb23";
-const char* rocksdb_build_git_datetime = "rocksdb_build_git_datetime:Sat Nov 16 21:47:00 EST 2013";
+const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:5c24e7e3091105d34a654117a2cb6a845dc644d7";
+const char* rocksdb_build_git_datetime = "rocksdb_build_git_datetime:Tue 19 Nov 2013 14:09:46 EST";
 const char* rocksdb_build_compile_date = __DATE__;
 const char* rocksdb_build_compile_time = __TIME__;
diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 5f4d65a..4ed6c88 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -55,7 +55,7 @@
               , 'leveldb-<(ldbversion)/util/env_posix.cc'
             ]
           , 'defines': [
-                'LEVELDB_PLATFORM_POSIX=1'
+                'ROCKSDB_PLATFORM_POSIX=1'
             ]
           , 'cflags': [
                 '-std=gnu++0x'
@@ -126,14 +126,19 @@
             'defines': [
                 'OS_MACOSX=1'
             ]
-          , 'libraries': []
-          , 'ccflags': []
           , 'xcode_settings': {
                 'WARNING_CFLAGS': [
                     '-Wno-sign-compare'
                   , '-Wno-unused-variable'
                   , '-Wno-unused-function'
+                  , '-Wno-ignored-qualifiers'
                 ]
+              , 'OTHER_CPLUSPLUSFLAGS': [
+                    '-mmacosx-version-min=10.7'
+                  , '-std=c++11'
+                  , '-stdlib=libc++'
+                ]
+              , 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
             }
         }]
     ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git