cockroachdb / c-rocksdb

🚫 DEPRECATED
45 stars 19 forks source link

Update upstream to 5.0.1. #29

Closed petermattis closed 7 years ago

petermattis commented 7 years ago
diff --git a/import.sh b/import.sh
index 3d6dbfd..5d20924 100755
--- a/import.sh
+++ b/import.sh
@@ -32,9 +32,9 @@ set -eu

 rm -rf internal/*
 find . -type l -not -path './.git/*' | xargs rm
-curl -sL https://github.com/facebook/rocksdb/archive/v4.11.2.tar.gz | tar zxf - -C internal --strip-components=1
+curl -sL https://github.com/facebook/rocksdb/archive/v5.0.1.tar.gz | tar zxf - -C internal --strip-components=1
 make -C internal util/build_version.cc
-patch -p1 < gitignore.patch
+# patch -p1 < gitignore.patch
 patch -p1 < testharness.patch
 # Downcase some windows-only includes for compatibility with mingw64.
 grep -lRF '<Windows.h>' internal | xargs sed -i~ 's!<Windows.h>!<windows.h>!g'
tamird commented 7 years ago

Why'd you comment out the gitignore patch? If it's no longer needed, let's remove it.

petermattis commented 7 years ago

Yes, the gitignore patch is no longer needed. Removed along with the other unused patches.