mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-08-14 23:34:46 +00:00
94db047dfc
Upgrade libsodium from 1.0.19 to 1.0.20 for minifi-cpp third party dependency. Updated below patch for upgrading: 0003-Fix-libsodium-build.patch Removed below patch because it is in the new version: 0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patcha 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 a4e49b4b5b11e7246d0e06da583ba8fdb9ed40d8 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>
|
|
[Adapted the patch when upgrading minifi-cpp from 0.99.1 to 0.99.2
|
|
and libsodium from 1.0.19 to 1.0.20.]
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
---
|
|
cmake/BundledLibSodium.cmake | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake
|
|
index 001a90dad..73b712512 100644
|
|
--- a/cmake/BundledLibSodium.cmake
|
|
+++ b/cmake/BundledLibSodium.cmake
|
|
@@ -60,14 +60,14 @@ 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
|
|
|