From 25ac8ca06d583abd650c300485600790ac978630 Mon Sep 17 00:00:00 2001 From: Sagar Vemuri Date: Fri, 12 Jan 2018 23:36:27 -0800 Subject: [PATCH] Revert Snappy version upgrade Summary: Java static builds are again broken, this time due Snappy version upgrade introduced in 90c1d81975a03b0f8b352ddc614fbc99c2496ddd (#3331). This is due to two reasons: 1. The new Snappy packages should now be downloaded from https://github.com/google/snappy/archive/ instead of https://github.com/google/snappy/releases/download/ which we are using now. 1. In addition to the the above URL change, Snappy changed its build from using autotools to CMake based : https://github.com/google/snappy/blame/e69d9f880677f2aa3488c80b953ec4309f0dfa2e/README.md#L65-L72 So more changes are needed if we are going to upgrade to 1.1.7. Hence reverting the version upgrade until we figure them out. Closes https://github.com/facebook/rocksdb/pull/3363 Differential Revision: D6716983 Pulled By: sagar0 fbshipit-source-id: f451a1bc5eb0bb090f4da07bc3e5ba72cf89aefa --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b56deacc5..ec55abcea 100644 --- a/Makefile +++ b/Makefile @@ -1553,8 +1553,8 @@ ZLIB_DOWNLOAD_BASE ?= http://zlib.net BZIP2_VER ?= 1.0.6 BZIP2_SHA256 ?= a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd BZIP2_DOWNLOAD_BASE ?= http://www.bzip.org -SNAPPY_VER ?= 1.1.7 -SNAPPY_SHA256 ?= 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 +SNAPPY_VER ?= 1.1.4 +SNAPPY_SHA256 ?= 134bfe122fd25599bb807bb8130e7ba6d9bdb851e0b16efcb83ac4f5d0b70057 SNAPPY_DOWNLOAD_BASE ?= https://github.com/google/snappy/releases/download LZ4_VER ?= 1.8.0 LZ4_SHA256 ?= 2ca482ea7a9bb103603108b5a7510b7592b90158c151ff50a28f1ca8389fccf6