mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-09 04:26:51 +00:00
cf88ed337b
ChangeLog: https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65145325 License-Update: Drop the license for cxxopts and add the license for argparse(MIT)[1]. Update the license for protobuf(3-Clause BSD) and add the licenses for RE2(3-Clause BSD) and c-ares(MIT)[2]. Drop the license for ios-cmake[3]. Add the license for Lua(MIT)[4]. Drop the license for libcoap[5]. Drop the license for uthash[6]. Drop the licenses for LightPcapNg and PcapPlusPlus[7]. Add the licenses for HdrHistogram(CC0-1.0) and llhttp(MIT)[8]. [1]1dfab222d4[2]20d281adaf[3]1815c018ce[4]3d7262a883[5]3bbaa0789a[6]78af9f665a[7]37891aafb8[8]bd1182eb8cSigned-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From a19e548826e65a95a55ac6b9c12a83d3dcc0010d 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 98d05b737..4f0faa879 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.34.1
|
|
|