From d417b693a5f4d74aa1ade1e58e3363db18901c85 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 18 Jan 2019 14:19:39 +0100 Subject: 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 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-oe/recipes-dbs') diff --git a/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb b/meta-oe/recipes-dbs/rocksdb/rocksdb_git.bb index c926d44720..b7faa02bf2 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 -- cgit 1.2.3-korg