From c8513cde0cb007d7a198fa61b8d245a71988281d Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Mon, 29 Aug 2016 04:24:08 +0100 Subject: [PATCH] Update the download location of Snappy (#1304) * Fix the download location of Snappy, no longer available from Google Code * Ensure that curl follows any redirect headers when downloading binaries --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c3e055a26..7568abd8c 100644 --- a/Makefile +++ b/Makefile @@ -1322,29 +1322,29 @@ endif libz.a: -rm -rf zlib-1.2.8 - curl -O http://zlib.net/zlib-1.2.8.tar.gz + 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 . libbz2.a: -rm -rf bzip2-1.0.6 - curl -O http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz + curl -O -L http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz tar xvzf bzip2-1.0.6.tar.gz cd bzip2-1.0.6 && make CFLAGS='-fPIC -O2 -g -D_FILE_OFFSET_BITS=64' cp bzip2-1.0.6/libbz2.a . libsnappy.a: - -rm -rf snappy-1.1.1 - curl -O https://snappy.googlecode.com/files/snappy-1.1.1.tar.gz - tar xvzf snappy-1.1.1.tar.gz - cd snappy-1.1.1 && ./configure --with-pic --enable-static - cd snappy-1.1.1 && make - cp snappy-1.1.1/.libs/libsnappy.a . + -rm -rf snappy-1.1.3 + curl -O -L https://github.com/google/snappy/releases/download/1.1.3/snappy-1.1.3.tar.gz + tar xvzf snappy-1.1.3.tar.gz + cd snappy-1.1.3 && ./configure --with-pic --enable-static + cd snappy-1.1.3 && make + cp snappy-1.1.3/.libs/libsnappy.a . liblz4.a: -rm -rf lz4-r127 - curl -O https://codeload.github.com/Cyan4973/lz4/tar.gz/r127 + curl -O -L https://codeload.github.com/Cyan4973/lz4/tar.gz/r127 mv r127 lz4-r127.tar.gz tar xvzf lz4-r127.tar.gz cd lz4-r127/lib && make CFLAGS='-fPIC' all @@ -1355,7 +1355,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.1 -I./lz4-r127/lib +JAVA_STATIC_INCLUDES = -I./zlib-1.2.8 -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)