mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
Yi Zhao
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] https://github.com/apache/nifi-minifi-cpp/commit/1dfab222d44100186e3450cd0fc964f04708734b [2] https://github.com/apache/nifi-minifi-cpp/commit/20d281adafb95fc88d9e58ed47e527b1188f8ad3 [3] https://github.com/apache/nifi-minifi-cpp/commit/1815c018ce928db30f3a36f49aeb43ea94834088 [4] https://github.com/apache/nifi-minifi-cpp/commit/3d7262a883dff57b7e0999a20f6e745d1197f480 [5] https://github.com/apache/nifi-minifi-cpp/commit/3bbaa0789a142e95edb45a73ad68cd8c620a1495 [6] https://github.com/apache/nifi-minifi-cpp/commit/78af9f665ae00ea1e14f96a3bed95ed3877d5403 [7] https://github.com/apache/nifi-minifi-cpp/commit/37891aafb8b2220622a97c29a13a854388193b0a [8] https://github.com/apache/nifi-minifi-cpp/commit/bd1182eb8cc6121a958d28db41ab27d24d6f54bc Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
79 lines
4.3 KiB
Diff
79 lines
4.3 KiB
Diff
From 429b2b357e5142e2b845da95bdd38e8fc1229831 Mon Sep 17 00:00:00 2001
|
|
From: Yi Zhao <yi.zhao@windriver.com>
|
|
Date: Tue, 19 Mar 2024 20:48:25 +0800
|
|
Subject: [PATCH] Fix osspuuid build
|
|
|
|
* Specify correct configure options to fix osspuuid cross build.
|
|
* Do not download osspuuid source during compile.
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
---
|
|
cmake/BundledOSSPUUID.cmake | 10 +++++-----
|
|
.../ossp-uuid/ossp-uuid-cross-compile-fix.patch | 13 +++++++++++++
|
|
2 files changed, 18 insertions(+), 5 deletions(-)
|
|
create mode 100644 thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
|
|
|
|
diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake
|
|
index 747e52c27..fb6e2164d 100644
|
|
--- a/cmake/BundledOSSPUUID.cmake
|
|
+++ b/cmake/BundledOSSPUUID.cmake
|
|
@@ -23,10 +23,12 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
|
|
set(PATCH_FILE1 "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch")
|
|
set(PATCH_FILE2 "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-no-prog.patch")
|
|
set(PATCH_FILE3 "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-update-config-guess.patch")
|
|
+ set(PATCH_FILE4 "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch")
|
|
set(PC ${Bash_EXECUTABLE} -c "set -x &&\
|
|
(\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE1}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE1}\") &&\
|
|
(\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE2}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE2}\") &&\
|
|
- (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE3}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE3}\") ")
|
|
+ (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE3}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE3}\") &&\
|
|
+ (\"${Patch_EXECUTABLE}\" -p1 -R -s -f --dry-run -i \"${PATCH_FILE4}\" || \"${Patch_EXECUTABLE}\" -p1 -N -i \"${PATCH_FILE4}\") ")
|
|
|
|
# Define byproducts
|
|
set(BYPRODUCTS "lib/libuuid.a"
|
|
@@ -45,7 +47,7 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
|
|
if(APPLE)
|
|
string(APPEND ADDITIONAL_COMPILER_FLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ")
|
|
endif()
|
|
- set(CONFIGURE_COMMAND ./configure "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} ${ADDITIONAL_COMPILER_FLAGS}" --enable-shared=no --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
|
|
+ set(CONFIGURE_COMMAND ac_cv_va_copy=C99 ./configure --host=${HOST_SYS} --build=${BUILD_SYS} "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_CXX_COMPILER}" "CFLAGS=${PASSTHROUGH_CMAKE_C_FLAGS} -fPIC" "CXXFLAGS=${PASSTHROUGH_CMAKE_CXX_FLAGS} -fPIC" --enable-shared=no --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
|
|
|
|
string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type)
|
|
if(build_type MATCHES debug)
|
|
@@ -54,10 +56,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
|
|
|
|
ExternalProject_Add(
|
|
ossp-uuid-external
|
|
- URL "https://deb.debian.org/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz"
|
|
- URL_HASH "SHA256=11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0"
|
|
BUILD_IN_SOURCE true
|
|
- SOURCE_DIR "${BINARY_DIR}/thirdparty/ossp-uuid-src"
|
|
+ SOURCE_DIR "${SOURCE_DIR}/thirdparty/uuid-1.6.2"
|
|
BUILD_COMMAND make
|
|
CMAKE_COMMAND ""
|
|
UPDATE_COMMAND ""
|
|
diff --git a/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
|
|
new file mode 100644
|
|
index 000000000..b8d7b0bba
|
|
--- /dev/null
|
|
+++ b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
|
|
@@ -0,0 +1,13 @@
|
|
+diff --git a/shtool b/shtool
|
|
+index a2d2567..ab4fe17 100755
|
|
+--- a/shtool
|
|
++++ b/shtool
|
|
+@@ -1400,7 +1400,7 @@ install )
|
|
+ if [ ".$opt_t" = .yes ]; then
|
|
+ echo "strip $dsttmp" 1>&2
|
|
+ fi
|
|
+- strip $dsttmp || shtool_exit $?
|
|
++ $STRIP $dsttmp || shtool_exit $?
|
|
+ fi
|
|
+ if [ ".$opt_o" != . ]; then
|
|
+ if [ ".$opt_t" = .yes ]; then
|
|
--
|
|
2.34.1
|
|
|