Fix zstd/zdict include path for java static build

[sagar0]

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:

rocksdb/util/compression.h

Line 39 in e3a06f1

#include <zdict.h>

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.

Test Plan:
PORTABLE=1 ROCKSDB_NO_FBCODE=1 make rocksdbjavastatic
all java tests: PORTABLE=1 ROCKSDB_NO_FBCODE=1 make jtest
Without PORTABLE and ROCKSDB_NO_FBCODE: make rocksdbjavastatic
Dynamic: make rocksdbjava

[sagar0]

#3057 is not in 5.9 branch. So we don't need this fix backported to 5.9.

[ajkr]

more generally, you could do a DESTDIR="./zstd-$(ZSTD_VER)" make install and then use headers/libraries under that directory the same way we do for system-installed zstd.

[ajkr]

btw you can assign to me if you want since I broke it. or land as-is is fine too.

[sagar0]

The current fix works, but I am trying to see how to make use of make install as @ajkr suggested.

[facebook-github-bot]

@sagar0 has updated the pull request.

[sagar0]

Changed libzstd.a target to use make install inside zstd/lib directory instead of doing a make all. This has the advantage of collecting all header files in one location, and future-proofs us if we end up using any new headers introduced by zstd.

After the build:

svemuri@devbig187 ~/rocksdb/zstd-1.2.0/lib/include (zstd-java-static)  $ ls -l
total 76
-rw-r--r--. 1 svemuri users 11408 Jan  5 13:54 zbuff.h
-rw-r--r--. 1 svemuri users 10727 Jan  5 13:54 zdict.h
-rw-r--r--. 1 svemuri users  2499 Jan  5 13:54 zstd_errors.h
-rw-r--r--. 1 svemuri users 47252 Jan  5 13:54 zstd.h

[adamretter]

@sagar0 So the destination for make install is inside the temp build folder... right?

[sagar0]

That's right. DESTDIR will be zstd-1.2.0/lib (.) and all the artifacts will be 'installed' in this directory.

[facebook-github-bot]

@sagar0 has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

[sagar0]

Thanks @adamretter .

[facebook-github-bot]

@sagar0 is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.