mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-13 21:34:50 +00:00
c0e52930a9
Below changes are done for upgrading minifi-cpp from 0.99.1 to 0.99.2. Updated below patches: 0001-Do-not-use-bundled-packages.patch 0003-Fix-libsodium-build.patch Removed below patch for it is available in new version: 0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch Updated third-party components' versions to be aligned with new version's release note: expected-lite 0.6.3->0.9.0 asio 1.29.0->1.34.2 fmt 11.1.4->11.2.0 Added new third-party component: jsoncons 1.3.2. Added DEPENDS on pugixml 1.15 (use the version provided by system). Added new configs to disable unnecessary third-party components. Aligned file names and installation paths with new version 0.99.2. Correct LICENSE. ChangeLog: https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325 License-Update: Added BSL-1.0 (jsoncons) and fixed typo in concurrentqueue description. [1] Removed TinyXml2 (Zlib license) from LICENSE and Zlib license is needed by other bundled components. [2] No new license type. Changed protobuf from "within gRPC" to standalone bundling. [3] Added MIT license (llama.cpp). [4] Added benchmark (ALv2) to LICENSE/NOTICE. No new license since Apache-2.0 already present. [5] [1] https://github.com/apache/nifi-minifi-cpp/commit/e25a247a4 [2] https://github.com/apache/nifi-minifi-cpp/commit/f28961cfb [3] https://github.com/apache/nifi-minifi-cpp/commit/97087b22e [4] https://github.com/apache/nifi-minifi-cpp/commit/8602b76d2 [5] https://github.com/apache/nifi-minifi-cpp/commit/54a643c72 Signed-off-by: Li Zhou <li.zhou@windriver.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
From d48ababf341708885ecf687ebc46bb1d84ca868d Mon Sep 17 00:00:00 2001
|
|
From: Yi Zhao <yi.zhao@windriver.com>
|
|
Date: Tue, 19 Mar 2024 20:56:05 +0800
|
|
Subject: [PATCH] Fix libsodium build
|
|
|
|
* Specify correct configure options to fix libsodium cross build.
|
|
* Do not download libsodium source during compile.
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
[lz: Adapted the patch for context changes when upgrading
|
|
from 0.99.1 to 0.99.2.]
|
|
Signed-off-by: Li Zhou <li.zhou@windriver.com>
|
|
---
|
|
cmake/BundledLibSodium.cmake | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake
|
|
index 001a90dad..87a3244fd 100644
|
|
--- a/cmake/BundledLibSodium.cmake
|
|
+++ b/cmake/BundledLibSodium.cmake
|
|
@@ -60,14 +60,12 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR)
|
|
TLS_VERIFY TRUE
|
|
)
|
|
else()
|
|
- set(CONFIGURE_COMMAND ./configure --disable-pie --enable-minimal "--prefix=${LIBSODIUM_BIN_DIR}")
|
|
+ set(CONFIGURE_COMMAND ./configure --host=${HOST_SYS} --build=${BUILD_SYS} --disable-pie --enable-minimal "--prefix=${LIBSODIUM_BIN_DIR}")
|
|
|
|
ExternalProject_Add(
|
|
libsodium-external
|
|
- URL "${LIBSODIUM_OFFICIAL_MIRROR_URL}" "${LIBSODIUM_GITHUB_MIRROR_URL}" "${LIBSODIUM_GENTOO_MIRROR_URL}"
|
|
- URL_HASH ${LIBSODIUM_URL_HASH}
|
|
BUILD_IN_SOURCE true
|
|
- SOURCE_DIR "${BINARY_DIR}/thirdparty/libsodium-src"
|
|
+ SOURCE_DIR "${SOURCE_DIR}/thirdparty/libsodium-stable"
|
|
BUILD_COMMAND make
|
|
CMAKE_COMMAND ""
|
|
UPDATE_COMMAND ""
|
|
--
|
|
2.34.1
|
|
|