From 4e439b01c91b0cd28f99a98314cb6a0bd118e375 Mon Sep 17 00:00:00 2001
From: peter <peter.reijnders@verpeteren.nl>
Date: Tue, 12 Nov 2019 16:59:24 +0100
Subject: [PATCH] Update leveldb to 1.22

---
 configure_libnidiumcore |  6 +++---
 patch/leveldb.patch     | 28 ----------------------------
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 patch/leveldb.patch

diff --git a/configure_libnidiumcore b/configure_libnidiumcore
index 2e2216b7..ae1c8fca 100755
--- a/configure_libnidiumcore
+++ b/configure_libnidiumcore
@@ -52,10 +52,10 @@ def leveldb():
         env.set("TARGET_OS", "OS_ANDROID_CROSSCOMPILE")
 
     return {
-        "location": Deps.GitRepo("https://github.com/google/leveldb.git", tag="v1.18"),
+        "location": Deps.GitRepo("https://github.com/google/leveldb.git", tag="1.22"),
         # leveldb make doest not detect CXXFLAGS changes, so we force "make clean"
-        "build": ["make clean","make"],
-        "patchs": [os.path.join(CONFIGURE_PATH, "patch", "leveldb.patch")],
+        "build": ["cmake .", "make clean", "make"],
+        #"patchs": [os.path.join(CONFIGURE_PATH, "patch", "leveldb.patch")],
         "env": env,
         "outputs": ["libleveldb(.a|.lib)"]
     }
diff --git a/patch/leveldb.patch b/patch/leveldb.patch
deleted file mode 100644
index 04aaef41..00000000
--- a/patch/leveldb.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- leveldb/build_detect_platform
-+++ leveldb/build_detect_platform
-@@ -190,25 +190,6 @@ EOF
-         COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX"
-     fi
- 
--    # Test whether Snappy library is installed
--    # http://code.google.com/p/snappy/
--    $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null  <<EOF
--      #include <snappy.h>
--      int main() {}
--EOF
--    if [ "$?" = 0 ]; then
--        COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
--        PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
--    fi
--
--    # Test whether tcmalloc is available
--    $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null  <<EOF
--      int main() {}
--EOF
--    if [ "$?" = 0 ]; then
--        PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
--    fi
--
-     rm -f $CXXOUTPUT 2>/dev/null
- fi
-