diff options
Diffstat (limited to 'meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch')
-rw-r--r-- | meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch b/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch deleted file mode 100644 index 57433b057a..0000000000 --- a/meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 46a4e585175cac8d76bd0b64f0fc27c9e22f04a1 Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@nextrem.ch> -Date: Mon, 12 Oct 2020 21:22:46 +0200 -Subject: [PATCH] cmake: Use exported target for bz2 - -Without this change, CMake puts the entire path into the generated file. -This is not portable and makes it fail in environment like Yocto. - -Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541] ---- - CMakeLists.txt | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 676192913..801586c30 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,7 +32,7 @@ - # 3. cmake .. - # 4. make -j - --cmake_minimum_required(VERSION 3.5.1) -+cmake_minimum_required(VERSION 3.7.2) - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/") - include(ReadVersion) -@@ -148,12 +148,7 @@ else() - if(WITH_BZ2) - find_package(BZip2 REQUIRED) - add_definitions(-DBZIP2) -- if(BZIP2_INCLUDE_DIRS) -- include_directories(${BZIP2_INCLUDE_DIRS}) -- else() -- include_directories(${BZIP2_INCLUDE_DIR}) -- endif() -- list(APPEND THIRDPARTY_LIBS ${BZIP2_LIBRARIES}) -+ list(APPEND THIRDPARTY_LIBS BZip2::BZip2) - endif() - - if(WITH_LZ4) --- -2.28.0 - |