diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2024-03-21 11:13:05 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2024-03-20 20:16:07 -0700 |
| commit | 7cf7c4c7828e9ad673f717f4cad9997314d4b1aa (patch) | |
| tree | 6d312f3b628c96e375e01738133ce6455fd8e7e1 /meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch | |
| parent | 0c19e65a0969dc79093284e98b43fd46468a499f (diff) | |
| download | meta-openembedded-contrib-7cf7c4c7828e9ad673f717f4cad9997314d4b1aa.tar.gz | |
minifi-cpp: upgrade 0.7.0 -> 0.15.0
Release Notes:
https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325#ReleaseNotesMiNiFi(C++)-Versioncpp-0.15.0
* Use external dependencies where possible to get rid of bundled
packages.
* Add PACKAGECONFIGs.
* Use its own systemd service file.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch')
| -rw-r--r-- | meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch new file mode 100644 index 0000000000..a08962724e --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch @@ -0,0 +1,39 @@ +From 1c697e4d75f0045d5364d622960ff8047a4ad3ec 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> +--- + cmake/BundledLibSodium.cmake | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake +index 3a3daf41..d851f753 100644 +--- a/cmake/BundledLibSodium.cmake ++++ b/cmake/BundledLibSodium.cmake +@@ -58,14 +58,12 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR) + EXCLUDE_FROM_ALL 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.25.1 + |