From e29bb934f7ad2133dd2b07ec0ae3dcefb06a83fa Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Fri, 20 Jan 2017 13:09:26 -0800 Subject: [PATCH] Zlib 1.2.8 is no longer available, switched to 1.2.10 Summary: Closes https://github.com/facebook/rocksdb/pull/1741 Differential Revision: D4380116 Pulled By: yiwu-arbug fbshipit-source-id: 7cf09df --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 11220ffa5..b5ba33666 100644 --- a/Makefile +++ b/Makefile @@ -1390,11 +1390,11 @@ ifeq ($(PLATFORM), OS_SOLARIS) endif libz.a: - -rm -rf zlib-1.2.8 - curl -O -L http://zlib.net/zlib-1.2.8.tar.gz - tar xvzf zlib-1.2.8.tar.gz - cd zlib-1.2.8 && CFLAGS='-fPIC' ./configure --static && make - cp zlib-1.2.8/libz.a . + -rm -rf zlib-1.2.10 + curl -O -L http://zlib.net/zlib-1.2.10.tar.gz + tar xvzf zlib-1.2.10.tar.gz + cd zlib-1.2.10 && CFLAGS='-fPIC' ./configure --static && make + cp zlib-1.2.10/libz.a . libbz2.a: -rm -rf bzip2-1.0.6 @@ -1424,7 +1424,7 @@ java_static_libobjects = $(patsubst %,jls/%,$(LIBOBJECTS)) CLEAN_FILES += jls JAVA_STATIC_FLAGS = -DZLIB -DBZIP2 -DSNAPPY -DLZ4 -JAVA_STATIC_INCLUDES = -I./zlib-1.2.8 -I./bzip2-1.0.6 -I./snappy-1.1.3 -I./lz4-r127/lib +JAVA_STATIC_INCLUDES = -I./zlib-1.2.10 -I./bzip2-1.0.6 -I./snappy-1.1.3 -I./lz4-r127/lib $(java_static_libobjects): jls/%.o: %.cc libz.a libbz2.a libsnappy.a liblz4.a $(AM_V_CC)mkdir -p $(@D) && $(CXX) $(CXXFLAGS) $(JAVA_STATIC_FLAGS) $(JAVA_STATIC_INCLUDES) -fPIC -c $< -o $@ $(COVERAGEFLAGS)