From: Adam Retter Date: Mon, 15 May 2017 17:45:14 +0000 (-0700) Subject: Make sure that zstd is statically linked correctly in the Java static build X-Git-Tag: rocksdb-5.3.5~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50e0164aca0027ba58da9d80734fdc32854a6a6f;p=rocksdb.git Make sure that zstd is statically linked correctly in the Java static build Summary: Closes https://github.com/facebook/rocksdb/issues/2280 Closes https://github.com/facebook/rocksdb/pull/2292 Differential Revision: D5061259 Pulled By: sagar0 fbshipit-source-id: eec89111d114c04beee5870a4eb4b51857754783 --- diff --git a/Makefile b/Makefile index f16e60824..e337fa11d 100644 --- a/Makefile +++ b/Makefile @@ -1484,8 +1484,8 @@ libzstd.a: java_static_libobjects = $(patsubst %,jls/%,$(LIBOBJECTS)) CLEAN_FILES += jls -JAVA_STATIC_FLAGS = -DZLIB -DBZIP2 -DSNAPPY -DLZ4 -JAVA_STATIC_INCLUDES = -I./zlib-$(ZLIB_VER) -I./bzip2-$(BZIP2_VER) -I./snappy-$(SNAPPY_VER) -I./lz4-$(LZ4_VER)/lib +JAVA_STATIC_FLAGS = -DZLIB -DBZIP2 -DSNAPPY -DLZ4 -DZSTD +JAVA_STATIC_INCLUDES = -I./zlib-$(ZLIB_VER) -I./bzip2-$(BZIP2_VER) -I./snappy-$(SNAPPY_VER) -I./lz4-$(LZ4_VER)/lib -I./zstd-$(ZSTD_VER)/lib $(java_static_libobjects): jls/%.o: %.cc libz.a libbz2.a libsnappy.a liblz4.a libzstd.a $(AM_V_CC)mkdir -p $(@D) && $(CXX) $(CXXFLAGS) $(JAVA_STATIC_FLAGS) $(JAVA_STATIC_INCLUDES) -fPIC -c $< -o $@ $(COVERAGEFLAGS)