[Pkg-javascript-commits] [node-leveldown] 268/492: clean up (dry) gyp

[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 de60e1c7cbafab9b04c55e49315a1c83d453f4d8
Author: Rod Vagg <rod at vagg.org>
Date:   Sun Mar 24 19:56:50 2013 +1100

    clean up (dry) gyp
---
 deps/leveldb/leveldb.gyp | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index 7d8eef7..9d061e0 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -18,8 +18,7 @@
         ]
     }
   , 'defines': [
-        'XSNAPPY=1'
-      , 'LEVELDB_PLATFORM_UV=1'
+        'SNAPPY=1'
     ]
   , 'include_dirs': [
         'leveldb-<(ldbversion)/'
@@ -32,7 +31,8 @@
                 'leveldb-<(ldbversion)/port/win'
             ]
           , 'defines': [
-                'NOMINMAX=1'
+                'LEVELDB_PLATFORM_UV=1'
+              , 'NOMINMAX=1'
               , '_HAS_EXCEPTIONS=0'
             ]
           , 'sources': [
@@ -54,55 +54,47 @@
               , 'leveldb-<(ldbversion)/port/port_posix.h'
               , 'leveldb-<(ldbversion)/util/env_posix.cc'
             ]
+          , 'defines': [
+                'LEVELDB_PLATFORM_POSIX=1'
+            ]
+          , 'ccflags': [
+                '-fno-builtin-memcmp'
+              , '-fPIC'
+            ]
+          , 'cflags': [
+                '-Wno-sign-compare'
+              , '-Wno-unused-but-set-variable'
+            ]
         }]
-
       , ['OS == "linux"', {
             'defines': [
                 'OS_LINUX=1'
-              , 'LEVELDB_PLATFORM_POSIX=1'
             ]
           , 'libraries': [
                 '-lpthread'
             ]
           , 'ccflags': [
-                '-fno-builtin-memcmp'
-              , '-pthread'
-              , '-fPIC'
-            ]
-          , 'cflags': [
-                '-Wno-sign-compare'
-              , '-Wno-unused-but-set-variable'
+                '-pthread'
             ]
         }]
       , ['OS == "solaris"', {
             'defines': [
                 'OS_SOLARIS=1'
-              , 'LEVELDB_PLATFORM_POSIX=1'
             ]
           , 'libraries': [
                 '-lrt'
               , '-lpthread'
             ]
           , 'ccflags': [
-                '-fno-builtin-memcmp'
-              , '-pthread'
-              , '-fPIC'
-            ]
-          , 'cflags': [
-                '-Wno-sign-compare'
-              , '-Wno-unused-but-set-variable'
+                '-pthread'
             ]
         }]
       , ['OS == "mac"', {
             'defines': [
                 'OS_MACOSX=1'
-              , 'LEVELDB_PLATFORM_POSIX=1'
             ]
           , 'libraries': []
-          , 'ccflags': [
-                '-fno-builtin-memcmp'
-              , '-fPIC'
-            ]
+          , 'ccflags': []
           , 'xcode_settings': {
                 'WARNING_CFLAGS': [
                     '-Wno-sign-compare'

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