]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commit
Fix zstd/zdict include path for java static build
authorSagar Vemuri <svemuri@fb.com>
Fri, 5 Jan 2018 23:30:12 +0000 (15:30 -0800)
committersdong <siying.d@fb.com>
Thu, 11 Jan 2018 01:50:53 +0000 (17:50 -0800)
commitcf2c88cb4d59401f9e044160fb53d879bf0ff2a8
tree6095ccc5ad3f0176ee0869e475f1b7a5e9623494
parentf897be87ae979703f6d8072538f787871fb890c5
Fix zstd/zdict include path for java static build

Summary:
With the ZSTD dictionary generator support added in #3057
`PORTABLE=1 ROCKSDB_NO_FBCODE=1 make rocksdbjavastatic` fails as it can't find zdict.h. Specifically due to:
https://github.com/facebook/rocksdb/blob/e3a06f12d27fd50af7b6c5941973f529601f9a3e/util/compression.h#L39
In java static builds zstd code gets directly downloaded from https://github.com/facebook/zstd , and in there zdict.h is under dictBuilder directory. So, I modified libzstd.a target to use `make install` to collect all the header files into a single location and used that as the zstd's include path.
Closes https://github.com/facebook/rocksdb/pull/3260

Differential Revision: D6669850

Pulled By: sagar0

fbshipit-source-id: f8a7562a670e5aed4c4fb6034a921697590d7285
Makefile