aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2019-01-18 14:19:39 +0100
committerKhem Raj <raj.khem@gmail.com>2019-01-19 10:06:20 -0800
commitd417b693a5f4d74aa1ade1e58e3363db18901c85 (patch)
treee687e2f81097b2ff77d7ffc0a4a800e8bb3c7a48 /meta-oe/recipes-dbs
parente6f9d00977ed812f130c16920cfe08971292eea1 (diff)
downloadmeta-openembedded-d417b693a5f4d74aa1ade1e58e3363db18901c85.tar.gz
meta-openembedded-d417b693a5f4d74aa1ade1e58e3363db18901c85.tar.bz2
meta-openembedded-d417b693a5f4d74aa1ade1e58e3363db18901c85.zip
rocksdb: make resulting cmake config relocatable
RocksDB is still using CMake 2.8 and thus does not make use of importet targets. This leads to hardcoded paths to the build directory in the resulting packaged files. The workaround for the issue is to bypass CMakes detection and let the linker deal with finding the right library. This is necessary until RocksDB moves to a more modern CMake. It's also applied in the Poco recipe right now. 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')
-rw-r--r--meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
index c926d4472..b7faa02bf 100644
--- a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
+++ b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb
@@ -18,9 +18,9 @@ S = "${WORKDIR}/git"
inherit cmake
PACKAGECONFIG ??= "bzip2 zlib lz4"
-PACKAGECONFIG[bzip2] = "-DWITH_BZ2=ON,-DWITH_BZ2=OFF,bzip2"
-PACKAGECONFIG[lz4] = "-DWITH_LZ4=ON,-DWITH_LZ4=OFF,lz4"
-PACKAGECONFIG[zlib] = "-DWITH_ZLIB=ON,-DWITH_ZLIB=OFF,zlib"
+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[lite] = "-DROCKSDB_LITE=ON,-DROCKSDB_LITE=OFF"
# Tools and tests currently don't compile on armv5 so we disable them