diff options
| author |   Pascal Bach <pascal.bach@siemens.com> | 2019-06-12 10:16:05 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-06-15 16:45:33 -0700 |
| commit | caa50b113e627e9c05ebc78df56cc9e3584311c3 (patch) | |
| tree | bc080bc0dab14be5b7532b88ffbe49918ce25771 /meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | |
| parent | 5e9bf7ea8f11b9b32664aa8543a5f3dec383700d (diff) | |
| download | meta-openembedded-contrib-caa50b113e627e9c05ebc78df56cc9e3584311c3.tar.gz | |
rocksdb: 5.18.3 -> 6.0.2
Also add support for gflags as these are enabled by default
and recipes are available in meta-oe. They can still be disabled via
PACKAGECONFIG.
zstd is also added as an PACKAGECONFIG but currently the zstd recipe is not in
meta-oe so it stays disabled for the moment.
This also includes a patch that fixes GCC9 compatibility, it's currently submitted
upstream but not yet accepted due to style issues.
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb')
| -rw-r--r-- | meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index 8d846197a9..9fd5ee15be 100644 --- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb +++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb @@ -6,24 +6,28 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "641fae60f63619ed5d0c9d9e4c4ea5a0ffa3e253" -SRCBRANCH = "5.18.fb" -PV = "5.18.3" +SRCREV = "628a7fd74b5611657106c57f724f1682b114684c" +SRCBRANCH = "6.0.fb" +PV = "6.0.2" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH} \ + file://0001-CMake-has-stock-FindZLIB-in-upper-case.patch \ file://0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch \ file://0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch \ + file://0001-fix-Issue-5303.patch \ " S = "${WORKDIR}/git" inherit cmake -PACKAGECONFIG ??= "bzip2 zlib lz4" +PACKAGECONFIG ??= "bzip2 zlib lz4 gflags" PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON -DBZIP2_LIBRARIES:STRING=bz2,-DWITH_BZ2=OFF,bzip2" PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON -DLZ4_LIBRARIES:STRING=lz4,-DWITH_LZ4=OFF,lz4" -PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON -DZLIB_LIBRARIES:STRING=z,-DWITH_ZLIB=OFF,zlib" +PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON -DZLIB_LIBRARY:STRING=z,-DWITH_ZLIB=OFF,zlib" +PACKAGECONFIG[zstd] = "-DWITH_ZSTD=ON,-DWITH_ZSTD=OFF,zstd" PACKAGECONFIG[lite] = "-DROCKSDB_LITE=ON,-DROCKSDB_LITE=OFF" +PACKAGECONFIG[gflags] = "-DWITH_GFLAGS=ON,-DWITH_GFLAGS=OFF,gflags" # Tools and tests currently don't compile on armv5 so we disable them EXTRA_OECMAKE = "\ |