summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch')
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
deleted file mode 100644
index 177c6adee6..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 8a5fe73f722718aa5c9a467c28a26913771f7208 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 19 Mar 2024 20:57:37 +0800
4Subject: [PATCH] Fix spdlog build
5
6* Specify CMAKE_INSTALL_LIBDIR to fix multilib build.
7* Do not download spdlog source during compile.
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 cmake/BundledSpdlog.cmake | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/cmake/BundledSpdlog.cmake b/cmake/BundledSpdlog.cmake
17index 974cbbaa..c0c45688 100644
18--- a/cmake/BundledSpdlog.cmake
19+++ b/cmake/BundledSpdlog.cmake
20@@ -35,11 +35,12 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
21 endif()
22
23 # Set build options
24- set(SPDLOG_SOURCE_DIR "${BINARY_DIR}/thirdparty/spdlog-src")
25+ set(SPDLOG_SOURCE_DIR "${SOURCE_DIR}/thirdparty/spdlog-src")
26 set(SPDLOG_INSTALL_DIR "${BINARY_DIR}/thirdparty/spdlog-install")
27 set(SPDLOG_LIBRARY "${SPDLOG_INSTALL_DIR}/${BYPRODUCT}")
28 set(SPDLOG_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
29 "-DCMAKE_INSTALL_PREFIX=${SPDLOG_INSTALL_DIR}"
30+ "-DCMAKE_INSTALL_LIBDIR=${LIBDIR}"
31 "-DSPDLOG_BUILD_EXAMPLE=OFF"
32 "-DSPDLOG_BUILD_TESTS=OFF"
33 "-DSPDLOG_BUILD_TESTING=OFF"
34@@ -49,7 +50,6 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
35 # Build project
36 ExternalProject_Add(
37 spdlog-external
38- URL "https://github.com/gabime/spdlog/archive/v1.8.0.zip"
39 SOURCE_DIR "${SPDLOG_SOURCE_DIR}"
40 CMAKE_ARGS ${SPDLOG_CMAKE_ARGS}
41 BUILD_BYPRODUCTS "${SPDLOG_LIBRARY}"
42--
432.25.1
44