summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/minifi-cpp/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp/files')
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch238
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch24
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0003-Fix-libsodium-build.patch8
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch44
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0004-Pass-noline-flag-to-flex.patch (renamed from meta-oe/recipes-extended/minifi-cpp/files/0005-Pass-noline-flag-to-flex.patch)12
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch32
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0006-CMakeLists.txt-do-not-use-ccache.patch (renamed from meta-oe/recipes-extended/minifi-cpp/files/0007-CMakeLists.txt-do-not-use-ccache.patch)12
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch36
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch141
-rw-r--r--meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch38
10 files changed, 371 insertions, 214 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
index b997d6ce7d..68fd1ee3e0 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Do-not-use-bundled-packages.patch
@@ -1,4 +1,4 @@
1From 65923a872e44cb461ef1a03374057351f0bc5efe Mon Sep 17 00:00:00 2001 1From 4952f03d150770ff06f9a12ff42d8de680407649 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 19 Mar 2024 19:39:04 +0800 3Date: Tue, 19 Mar 2024 19:39:04 +0800
4Subject: [PATCH] Do not use bundled packages 4Subject: [PATCH] Do not use bundled packages
@@ -10,60 +10,27 @@ Upstream-Status: Inappropriate [embedded specific]
10 10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12--- 12---
13 CMakeLists.txt | 23 ++++++----------------- 13 CMakeLists.txt | 3 +--
14 extensions/libarchive/CMakeLists.txt | 7 ++----- 14 cmake/GetBZip2.cmake | 3 +++
15 2 files changed, 8 insertions(+), 22 deletions(-) 15 cmake/GetCatch2.cmake | 4 ++++
16 cmake/GetCivetWeb.cmake | 3 +++
17 cmake/GetFmt.cmake | 3 +++
18 cmake/GetLibCURL.cmake | 3 +++
19 cmake/GetLibXml2.cmake | 3 +++
20 cmake/GetOpenSSL.cmake | 3 +++
21 cmake/GetRocksDB.cmake | 4 ++++
22 cmake/GetSpdlog.cmake | 4 ++++
23 cmake/GetZLIB.cmake | 3 +++
24 cmake/GetZstd.cmake | 4 ++++
25 extensions/libarchive/CMakeLists.txt | 6 ++----
26 13 files changed, 40 insertions(+), 6 deletions(-)
16 27
17diff --git a/CMakeLists.txt b/CMakeLists.txt 28diff --git a/CMakeLists.txt b/CMakeLists.txt
18index 13a2b992..8a1dd6d9 100644 29index 50e31d871..fc1718dfd 100644
19--- a/CMakeLists.txt 30--- a/CMakeLists.txt
20+++ b/CMakeLists.txt 31+++ b/CMakeLists.txt
21@@ -222,9 +222,7 @@ else() 32@@ -265,8 +265,7 @@ include(GetSpdlog)
22 endif() 33 get_spdlog()
23
24 if (NOT DISABLE_BZIP2 AND (NOT DISABLE_LIBARCHIVE OR (NOT DISABLE_ROCKSDB AND NOT WIN32)))
25- include(BundledBZip2)
26- use_bundled_bzip2(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
27- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/bzip2/dummy")
28+ find_package(BZip2 REQUIRED)
29 endif()
30
31 if(NOT WIN32)
32@@ -247,9 +245,7 @@ endif()
33
34 # OpenSSL
35 if (NOT OPENSSL_OFF)
36- include(BundledOpenSSL)
37- use_openssl("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
38- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl")
39+ find_package(OpenSSL REQUIRED)
40
41 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENSSL_SUPPORT")
42 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENSSL_SUPPORT")
43@@ -262,9 +258,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSODIUM_STATIC=1")
44 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSODIUM_STATIC=1")
45
46 # zlib
47-include(BundledZLIB)
48-use_bundled_zlib(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
49-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/zlib/dummy")
50+find_package(ZLIB REQUIRED)
51
52 # uthash
53 add_library(ut INTERFACE)
54@@ -272,9 +266,7 @@ target_include_directories(ut SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/thir
55
56 # cURL
57 if(NOT DISABLE_CURL)
58- include(BundledLibcURL)
59- use_bundled_curl(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
60- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/curl/dummy")
61+ find_package(CURL REQUIRED)
62 else()
63 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_CURL")
64 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_CURL")
65@@ -285,8 +277,7 @@ include(BundledSpdlog)
66 use_bundled_spdlog(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
67 34
68 # yaml-cpp 35 # yaml-cpp
69-include(BundledYamlCpp) 36-include(BundledYamlCpp)
@@ -72,27 +39,162 @@ index 13a2b992..8a1dd6d9 100644
72 39
73 # concurrentqueue 40 # concurrentqueue
74 add_library(concurrentqueue INTERFACE) 41 add_library(concurrentqueue INTERFACE)
75@@ -357,9 +348,7 @@ include(Extensions) 42diff --git a/cmake/GetBZip2.cmake b/cmake/GetBZip2.cmake
76 add_subdirectory(libminifi) 43index 2a7d47e9e..754122895 100644
77 44--- a/cmake/GetBZip2.cmake
78 if ((ENABLE_OPENWSMAN AND NOT DISABLE_CIVET AND NOT DISABLE_CURL) OR ENABLE_ALL OR ENABLE_AZURE) 45+++ b/cmake/GetBZip2.cmake
79- include(BundledLibXml2) 46@@ -23,5 +23,8 @@ function(get_bzip2 SOURCE_DIR BINARY_DIR)
80- use_bundled_libxml2(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) 47 message("Using CMake to build bzip2 from source")
81- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/libxml2/dummy") 48 include(BundledBZip2)
82+ find_package(LibXml2 REQUIRED) 49 use_bundled_bzip2(${SOURCE_DIR} ${BINARY_DIR})
83 endif() 50+ elseif(MINIFI_BZIP2_SOURCE STREQUAL "SYSTEM")
84 51+ message("Using bzip2 provided by system")
85 if (ENABLE_ALL OR ENABLE_PROMETHEUS OR NOT DISABLE_CIVET) 52+ find_package(BZip2 REQUIRED)
53 endif()
54 endfunction(get_bzip2)
55diff --git a/cmake/GetCatch2.cmake b/cmake/GetCatch2.cmake
56index d6c1d6acc..ec11b0a77 100644
57--- a/cmake/GetCatch2.cmake
58+++ b/cmake/GetCatch2.cmake
59@@ -23,5 +23,9 @@ function(get_catch2)
60 elseif(MINIFI_CATCH2_SOURCE STREQUAL "BUILD")
61 message("Using CMake to build Catch2 from source")
62 include(Catch2)
63+ elseif(MINIFI_CATCH2_SOURCE STREQUAL "SYSTEM")
64+ message("Using Catch2 provided by system")
65+ find_package(Catch2 REQUIRED)
66+ add_library(Catch2WithMain ALIAS Catch2::Catch2WithMain)
67 endif()
68 endfunction(get_catch2)
69diff --git a/cmake/GetCivetWeb.cmake b/cmake/GetCivetWeb.cmake
70index f30d22289..8fc39a0e2 100644
71--- a/cmake/GetCivetWeb.cmake
72+++ b/cmake/GetCivetWeb.cmake
73@@ -22,5 +22,8 @@ function(get_civetweb)
74 elseif(MINIFI_CIVETWEB_SOURCE STREQUAL "BUILD")
75 message("Using CMake to build CivetWeb from source")
76 include(CivetWeb)
77+ elseif(MINIFI_CIVETWEB_SOURCE STREQUAL "SYSTEM")
78+ message("Using CivetWeb provided by system")
79+ find_package(civetweb REQUIRED)
80 endif()
81 endfunction(get_civetweb)
82diff --git a/cmake/GetFmt.cmake b/cmake/GetFmt.cmake
83index f4f28458d..579a63897 100644
84--- a/cmake/GetFmt.cmake
85+++ b/cmake/GetFmt.cmake
86@@ -22,5 +22,8 @@ function(get_fmt)
87 elseif(MINIFI_FMT_SOURCE STREQUAL "BUILD")
88 message("Using CMake to build Fmt from source")
89 include(fmt)
90+ elseif(MINIFI_FMT_SOURCE STREQUAL "SYSTEM")
91+ message("Using Fmt provided by system")
92+ find_package(fmt REQUIRED)
93 endif()
94 endfunction(get_fmt)
95diff --git a/cmake/GetLibCURL.cmake b/cmake/GetLibCURL.cmake
96index afd38f3c9..0eac59ec4 100644
97--- a/cmake/GetLibCURL.cmake
98+++ b/cmake/GetLibCURL.cmake
99@@ -23,5 +23,8 @@ function(get_curl SOURCE_DIR BINARY_DIR)
100 message("Using CMake to build libcurl from source")
101 include(BundledLibcURL)
102 use_bundled_curl(${SOURCE_DIR} ${BINARY_DIR})
103+ elseif(MINIFI_LIBCURL_SOURCE STREQUAL "SYSTEM")
104+ message("Using libcurl provided by system")
105+ find_package(CURL REQUIRED)
106 endif()
107 endfunction(get_curl SOURCE_DIR BINARY_DIR)
108diff --git a/cmake/GetLibXml2.cmake b/cmake/GetLibXml2.cmake
109index 5915b117d..18048715d 100644
110--- a/cmake/GetLibXml2.cmake
111+++ b/cmake/GetLibXml2.cmake
112@@ -23,5 +23,8 @@ function(get_libxml2 SOURCE_DIR BINARY_DIR)
113 message("Using CMake to build libxml2 from source")
114 include(BundledLibXml2)
115 use_bundled_libxml2(${SOURCE_DIR} ${BINARY_DIR})
116+ elseif(MINIFI_LIBXML2_SOURCE STREQUAL "SYSTEM")
117+ message("Using libxml2 provided by system")
118+ find_package(libxml2 REQUIRED)
119 endif()
120 endfunction(get_libxml2)
121diff --git a/cmake/GetOpenSSL.cmake b/cmake/GetOpenSSL.cmake
122index 58132c6bf..2b142f94e 100644
123--- a/cmake/GetOpenSSL.cmake
124+++ b/cmake/GetOpenSSL.cmake
125@@ -23,5 +23,8 @@ function(get_openssl SOURCE_DIR BINARY_DIR)
126 message("Using CMake to build OpenSSL from source")
127 include(BundledOpenSSL)
128 use_openssl(${SOURCE_DIR} ${BINARY_DIR})
129+ elseif(MINIFI_OPENSSL_SOURCE STREQUAL "SYSTEM")
130+ message("Using OpenSSL provided by system")
131+ find_package(OpenSSL REQUIRED)
132 endif()
133 endfunction(get_openssl)
134diff --git a/cmake/GetRocksDB.cmake b/cmake/GetRocksDB.cmake
135index 0968afc38..3ca1fe565 100644
136--- a/cmake/GetRocksDB.cmake
137+++ b/cmake/GetRocksDB.cmake
138@@ -30,5 +30,9 @@ function(get_rocksdb SOURCE_DIR BINARY_DIR)
139 list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}/cmake/rocksdb/sys")
140 find_package(RocksDB REQUIRED)
141 endif()
142+ elseif(MINIFI_ROCKSDB_SOURCE STREQUAL "SYSTEM")
143+ message("Using RocksDB provided by system")
144+ list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}/cmake/rocksdb/sys")
145+ find_package(RocksDB REQUIRED)
146 endif()
147 endfunction(get_rocksdb SOURCE_DIR BINARY_DIR)
148diff --git a/cmake/GetSpdlog.cmake b/cmake/GetSpdlog.cmake
149index 747894984..6255e31bf 100644
150--- a/cmake/GetSpdlog.cmake
151+++ b/cmake/GetSpdlog.cmake
152@@ -27,5 +27,9 @@ function(get_spdlog)
153 elseif(MINIFI_SPDLOG_SOURCE STREQUAL "BUILD")
154 message("Using CMake to build spdlog from source")
155 include(Spdlog)
156+ elseif(MINIFI_SPDLOG_SOURCE STREQUAL "SYSTEM")
157+ message("Using spdlog provided by system")
158+ find_package(spdlog REQUIRED)
159+ add_library(spdlog ALIAS spdlog::spdlog)
160 endif()
161 endfunction(get_spdlog)
162diff --git a/cmake/GetZLIB.cmake b/cmake/GetZLIB.cmake
163index 6e7bea1e3..c15e2246a 100644
164--- a/cmake/GetZLIB.cmake
165+++ b/cmake/GetZLIB.cmake
166@@ -23,5 +23,8 @@ function(get_zlib SOURCE_DIR BINARY_DIR)
167 message("Using CMake to build zlib from source")
168 include(BundledZLIB)
169 use_bundled_zlib(${SOURCE_DIR} ${BINARY_DIR})
170+ elseif(MINIFI_ZLIB_SOURCE STREQUAL "SYSTEM")
171+ message("Using zlib provided by system")
172+ find_package(ZLIB REQUIRED)
173 endif()
174 endfunction(get_zlib)
175diff --git a/cmake/GetZstd.cmake b/cmake/GetZstd.cmake
176index a0334b02d..0e7600c22 100644
177--- a/cmake/GetZstd.cmake
178+++ b/cmake/GetZstd.cmake
179@@ -23,5 +23,9 @@ function(get_zstd)
180 elseif(MINIFI_ZSTD_SOURCE STREQUAL "BUILD")
181 message("Using CMake to build zstd from source")
182 include(Zstd)
183+ elseif(MINIFI_ZSTD_SOURCE STREQUAL "SYSTEM")
184+ message("Using zstd provided by system")
185+ find_package(zstd REQUIRED)
186+ add_library(zstd::zstd ALIAS zstd::libzstd_static)
187 endif()
188 endfunction(get_zstd)
86diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt 189diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt
87index 2b89d3ea..49e13e21 100644 190index bf7b2a7f5..eb6b71091 100644
88--- a/extensions/libarchive/CMakeLists.txt 191--- a/extensions/libarchive/CMakeLists.txt
89+++ b/extensions/libarchive/CMakeLists.txt 192+++ b/extensions/libarchive/CMakeLists.txt
90@@ -22,13 +22,10 @@ if (DISABLE_LIBARCHIVE) 193@@ -22,12 +22,10 @@ if (NOT ENABLE_LIBARCHIVE)
91 endif() 194 endif()
92 195
93 if (NOT DISABLE_LZMA) 196 if (ENABLE_LZMA)
94- include(BundledLibLZMA) 197- include(LibLZMA)
95- use_bundled_liblzma(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
96- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/liblzma/dummy") 198- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/liblzma/dummy")
97+ find_package(LibLZMA REQUIRED) 199+ find_package(LibLZMA REQUIRED)
98 endif() 200 endif()
@@ -104,5 +206,5 @@ index 2b89d3ea..49e13e21 100644
104 include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt) 206 include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
105 207
106-- 208--
1072.25.1 2092.34.1
108 210
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
index 65c52c6337..537beb85d3 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0002-Fix-osspuuid-build.patch
@@ -1,4 +1,4 @@
1From 4e8e1943541d3b887ba86dc1b488cbb058c7d1cd Mon Sep 17 00:00:00 2001 1From 429b2b357e5142e2b845da95bdd38e8fc1229831 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 19 Mar 2024 20:48:25 +0800 3Date: Tue, 19 Mar 2024 20:48:25 +0800
4Subject: [PATCH] Fix osspuuid build 4Subject: [PATCH] Fix osspuuid build
@@ -16,7 +16,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
16 create mode 100644 thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 16 create mode 100644 thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
17 17
18diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake 18diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake
19index c4fa1523..1faf2e5c 100644 19index 747e52c27..fb6e2164d 100644
20--- a/cmake/BundledOSSPUUID.cmake 20--- a/cmake/BundledOSSPUUID.cmake
21+++ b/cmake/BundledOSSPUUID.cmake 21+++ b/cmake/BundledOSSPUUID.cmake
22@@ -23,10 +23,12 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR) 22@@ -23,10 +23,12 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
@@ -33,16 +33,16 @@ index c4fa1523..1faf2e5c 100644
33 33
34 # Define byproducts 34 # Define byproducts
35 set(BYPRODUCTS "lib/libuuid.a" 35 set(BYPRODUCTS "lib/libuuid.a"
36@@ -39,7 +41,7 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR) 36@@ -45,7 +47,7 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
37 ENDFOREACH(BYPRODUCT) 37 if(APPLE)
38 38 string(APPEND ADDITIONAL_COMPILER_FLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ")
39 # Build project 39 endif()
40- set(CONFIGURE_COMMAND ./configure "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") 40- 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")
41+ 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") 41+ 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")
42
42 string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type) 43 string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type)
43 if(NOT build_type MATCHES debug) 44 if(build_type MATCHES debug)
44 list(APPEND CONFIGURE_COMMAND --enable-debug=yes) 45@@ -54,10 +56,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
45@@ -47,10 +49,8 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
46 46
47 ExternalProject_Add( 47 ExternalProject_Add(
48 ossp-uuid-external 48 ossp-uuid-external
@@ -56,7 +56,7 @@ index c4fa1523..1faf2e5c 100644
56 UPDATE_COMMAND "" 56 UPDATE_COMMAND ""
57diff --git a/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 57diff --git a/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
58new file mode 100644 58new file mode 100644
59index 00000000..b8d7b0bb 59index 000000000..b8d7b0bba
60--- /dev/null 60--- /dev/null
61+++ b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 61+++ b/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
62@@ -0,0 +1,13 @@ 62@@ -0,0 +1,13 @@
@@ -74,5 +74,5 @@ index 00000000..b8d7b0bb
74+ if [ ".$opt_o" != . ]; then 74+ if [ ".$opt_o" != . ]; then
75+ if [ ".$opt_t" = .yes ]; then 75+ if [ ".$opt_t" = .yes ]; then
76-- 76--
772.25.1 772.34.1
78 78
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
index a08962724e..10d9965ef4 100644
--- 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
@@ -1,4 +1,4 @@
1From 1c697e4d75f0045d5364d622960ff8047a4ad3ec Mon Sep 17 00:00:00 2001 1From a19e548826e65a95a55ac6b9c12a83d3dcc0010d Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 19 Mar 2024 20:56:05 +0800 3Date: Tue, 19 Mar 2024 20:56:05 +0800
4Subject: [PATCH] Fix libsodium build 4Subject: [PATCH] Fix libsodium build
@@ -14,7 +14,7 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
14 1 file changed, 2 insertions(+), 4 deletions(-) 14 1 file changed, 2 insertions(+), 4 deletions(-)
15 15
16diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake 16diff --git a/cmake/BundledLibSodium.cmake b/cmake/BundledLibSodium.cmake
17index 3a3daf41..d851f753 100644 17index 98d05b737..4f0faa879 100644
18--- a/cmake/BundledLibSodium.cmake 18--- a/cmake/BundledLibSodium.cmake
19+++ b/cmake/BundledLibSodium.cmake 19+++ b/cmake/BundledLibSodium.cmake
20@@ -58,14 +58,12 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR) 20@@ -58,14 +58,12 @@ function(use_bundled_libsodium SOURCE_DIR BINARY_DIR)
@@ -26,7 +26,7 @@ index 3a3daf41..d851f753 100644
26 26
27 ExternalProject_Add( 27 ExternalProject_Add(
28 libsodium-external 28 libsodium-external
29- URL "${LIBSODIUM_OFFICIAL_MIRROR_URL} ${LIBSODIUM_GITHUB_MIRROR_URL} ${LIBSODIUM_GENTOO_MIRROR_URL}" 29- URL "${LIBSODIUM_OFFICIAL_MIRROR_URL}" "${LIBSODIUM_GITHUB_MIRROR_URL}" "${LIBSODIUM_GENTOO_MIRROR_URL}"
30- URL_HASH ${LIBSODIUM_URL_HASH} 30- URL_HASH ${LIBSODIUM_URL_HASH}
31 BUILD_IN_SOURCE true 31 BUILD_IN_SOURCE true
32- SOURCE_DIR "${BINARY_DIR}/thirdparty/libsodium-src" 32- SOURCE_DIR "${BINARY_DIR}/thirdparty/libsodium-src"
@@ -35,5 +35,5 @@ index 3a3daf41..d851f753 100644
35 CMAKE_COMMAND "" 35 CMAKE_COMMAND ""
36 UPDATE_COMMAND "" 36 UPDATE_COMMAND ""
37-- 37--
382.25.1 382.34.1
39 39
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch b/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
deleted file mode 100644
index 177c6adee6..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0004-Fix-spdlog-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 8a5fe73f722718aa5c9a467c28a26913771f7208 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 19 Mar 2024 20:57:37 +0800
4Subject: [PATCH] Fix spdlog build
5
6* Specify CMAKE_INSTALL_LIBDIR to fix multilib build.
7* Do not download spdlog source during compile.
8
9Upstream-Status: Inappropriate [embedded specific]
10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 cmake/BundledSpdlog.cmake | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/cmake/BundledSpdlog.cmake b/cmake/BundledSpdlog.cmake
17index 974cbbaa..c0c45688 100644
18--- a/cmake/BundledSpdlog.cmake
19+++ b/cmake/BundledSpdlog.cmake
20@@ -35,11 +35,12 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
21 endif()
22
23 # Set build options
24- set(SPDLOG_SOURCE_DIR "${BINARY_DIR}/thirdparty/spdlog-src")
25+ set(SPDLOG_SOURCE_DIR "${SOURCE_DIR}/thirdparty/spdlog-src")
26 set(SPDLOG_INSTALL_DIR "${BINARY_DIR}/thirdparty/spdlog-install")
27 set(SPDLOG_LIBRARY "${SPDLOG_INSTALL_DIR}/${BYPRODUCT}")
28 set(SPDLOG_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
29 "-DCMAKE_INSTALL_PREFIX=${SPDLOG_INSTALL_DIR}"
30+ "-DCMAKE_INSTALL_LIBDIR=${LIBDIR}"
31 "-DSPDLOG_BUILD_EXAMPLE=OFF"
32 "-DSPDLOG_BUILD_TESTS=OFF"
33 "-DSPDLOG_BUILD_TESTING=OFF"
34@@ -49,7 +50,6 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
35 # Build project
36 ExternalProject_Add(
37 spdlog-external
38- URL "https://github.com/gabime/spdlog/archive/v1.8.0.zip"
39 SOURCE_DIR "${SPDLOG_SOURCE_DIR}"
40 CMAKE_ARGS ${SPDLOG_CMAKE_ARGS}
41 BUILD_BYPRODUCTS "${SPDLOG_LIBRARY}"
42--
432.25.1
44
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0005-Pass-noline-flag-to-flex.patch b/meta-oe/recipes-extended/minifi-cpp/files/0004-Pass-noline-flag-to-flex.patch
index 53939131ff..344e8839e7 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0005-Pass-noline-flag-to-flex.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0004-Pass-noline-flag-to-flex.patch
@@ -1,4 +1,4 @@
1From 083babbd6c6cc6f31530fbac0227c1d426fb0863 Mon Sep 17 00:00:00 2001 1From 229137659501ae51774dcb3249f94545bdd6e21f Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Tue, 19 Mar 2024 21:00:59 +0800 3Date: Tue, 19 Mar 2024 21:00:59 +0800
4Subject: [PATCH] Pass --noline flag to flex 4Subject: [PATCH] Pass --noline flag to flex
@@ -14,18 +14,18 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt 16diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt
17index 775b4116..84edc617 100644 17index c179ab3ef..7f507b03a 100644
18--- a/extensions/expression-language/CMakeLists.txt 18--- a/extensions/expression-language/CMakeLists.txt
19+++ b/extensions/expression-language/CMakeLists.txt 19+++ b/extensions/expression-language/CMakeLists.txt
20@@ -77,7 +77,7 @@ flex_target( 20@@ -103,7 +103,7 @@ flex_target(
21 el-scanner 21 el-scanner
22 ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.ll 22 ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.ll
23 ${CMAKE_CURRENT_SOURCE_DIR}/Scanner.cpp 23 ${CMAKE_BINARY_DIR}/el-generated/Scanner.cpp
24- COMPILE_FLAGS --c++ 24- COMPILE_FLAGS --c++
25+ COMPILE_FLAGS "--c++ --noline" 25+ COMPILE_FLAGS "--c++ --noline"
26 ) 26 )
27 27
28 add_flex_bison_dependency(el-scanner el-parser) 28 set(EL_GENERATED_INCLUDE_DIR ${CMAKE_BINARY_DIR}/el-generated)
29-- 29--
302.25.1 302.34.1
31 31
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch b/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch
new file mode 100644
index 0000000000..2e78b1087e
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0005-generateVersion.sh-set-correct-buildrev.patch
@@ -0,0 +1,32 @@
1From 1861170c6de3dd851324debf3a6eaeff4d8d8bce Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Fri, 14 Mar 2025 20:26:38 +0800
4Subject: [PATCH] generateVersion.sh: set correct buildrev
5
6Since this script is run outside the source directory, git log can not
7get the commit id, so buildrev is not set correctly. Fix the issue by
8adding -C option.
9
10Upstream-Status: Inappropriate [embedded specific]
11
12Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
13---
14 generateVersion.sh | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/generateVersion.sh b/generateVersion.sh
18index ff25afba8..0b50a1693 100755
19--- a/generateVersion.sh
20+++ b/generateVersion.sh
21@@ -28,7 +28,7 @@ buildident=$8
22 date=$(date +%s)
23
24 if [ -d "${src_dir}"/.git ]; then
25- buildrev=$(git log -1 --pretty=format:"%H")
26+ buildrev=$(git -C "${src_dir}" log -1 --pretty=format:"%H")
27 else
28 buildrev="Unknown"
29 fi
30--
312.34.1
32
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0007-CMakeLists.txt-do-not-use-ccache.patch b/meta-oe/recipes-extended/minifi-cpp/files/0006-CMakeLists.txt-do-not-use-ccache.patch
index 73a59f2a84..055a3e7b57 100644
--- a/meta-oe/recipes-extended/minifi-cpp/files/0007-CMakeLists.txt-do-not-use-ccache.patch
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0006-CMakeLists.txt-do-not-use-ccache.patch
@@ -1,4 +1,4 @@
1From 44867a8e4100a7296b98e0e850d950d24b980959 Mon Sep 17 00:00:00 2001 1From bbe5c95ef1755c4804c4561c03cafedeb004cb36 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Thu, 21 Mar 2024 10:18:39 +0800 3Date: Thu, 21 Mar 2024 10:18:39 +0800
4Subject: [PATCH] CMakeLists.txt: do not use ccache 4Subject: [PATCH] CMakeLists.txt: do not use ccache
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11 1 file changed, 6 insertions(+), 6 deletions(-) 11 1 file changed, 6 insertions(+), 6 deletions(-)
12 12
13diff --git a/CMakeLists.txt b/CMakeLists.txt 13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index 8a1dd6d91..8a5314544 100644 14index fc1718dfd..70c94c2ff 100644
15--- a/CMakeLists.txt 15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt 16+++ b/CMakeLists.txt
17@@ -82,12 +82,12 @@ if (USE_REAL_ODBC_TEST_DRIVER) 17@@ -84,12 +84,12 @@ if (MINIFI_USE_REAL_ODBC_TEST_DRIVER)
18 endif() 18 endif()
19 19
20 # Use ccache if present 20 # Use ccache if present
@@ -31,8 +31,8 @@ index 8a1dd6d91..8a5314544 100644
31+# message("-- Found ccache: ${CCACHE_FOUND}") 31+# message("-- Found ccache: ${CCACHE_FOUND}")
32+#endif(CCACHE_FOUND) 32+#endif(CCACHE_FOUND)
33 33
34 # Use gold linker if instructed 34 # Check for exec info before we enable the backtrace features.
35 if (UNIX AND USE_GOLD_LINKER AND NOT APPLE ) 35 CHECK_INCLUDE_FILE("execinfo.h" HAS_EXECINFO)
36-- 36--
372.25.1 372.34.1
38 38
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch b/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch
deleted file mode 100644
index 38893e74ac..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0006-OsUtils.h-add-missing-header-cstdint-for-int64_t.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 08d1b4b66fedde97eefb5e3ff6aa98fd02be7c21 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 20 Mar 2024 10:03:14 +0800
4Subject: [PATCH] OsUtils.h: add missing header <cstdint> for int64_t
5
6Fix build with musl:
7libminifi/include/utils/OsUtils.h:31:1: error: 'int64_t' does not name a type
8 31 | int64_t getCurrentProcessPhysicalMemoryUsage();
9 | ^~~~~~~
10libminifi/include/utils/OsUtils.h:22:1: note: 'int64_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
11 21 | #include <system_error>
12 +++ |+#include <cstdint>
13 22 |
14
15Upstream-Status: Pending
16
17Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
18---
19 libminifi/include/utils/OsUtils.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/libminifi/include/utils/OsUtils.h b/libminifi/include/utils/OsUtils.h
23index a7117233..5e623d1a 100644
24--- a/libminifi/include/utils/OsUtils.h
25+++ b/libminifi/include/utils/OsUtils.h
26@@ -19,6 +19,7 @@
27 #include <string>
28 #include <optional>
29 #include <system_error>
30+#include <cstdint>
31
32 struct sockaddr;
33
34--
352.25.1
36
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch b/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch
new file mode 100644
index 0000000000..792a7888e3
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch
@@ -0,0 +1,141 @@
1From 3a59f8e5331bb6be5d298bc5c136a79102196c1d Mon Sep 17 00:00:00 2001
2From: Frank Denis <github@pureftpd.org>
3Date: Fri, 20 Oct 2023 13:47:57 +0200
4Subject: [PATCH] aarch64: set compiler attributes *after* including
5 <arm_neon.h>
6
7Fixes #1321
8
9Upstream-Status: Backport
10[https://github.com/jedisct1/libsodium/commit/8f453f41f8834e0fe47610f2a3e03e696ddb3450]
11
12Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
13---
14 thirdparty/libsodium-stable/configure.ac | 11 ++++++-----
15 .../crypto_aead/aegis128l/aegis128l_armcrypto.c | 12 ++++++------
16 .../crypto_aead/aegis256/aegis256_armcrypto.c | 12 ++++++------
17 .../aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c | 12 ++++++------
18 4 files changed, 24 insertions(+), 23 deletions(-)
19
20diff --git a/thirdparty/libsodium-stable/configure.ac b/thirdparty/libsodium-stable/configure.ac
21index df83ef512..be67d3417 100644
22--- a/thirdparty/libsodium-stable/configure.ac
23+++ b/thirdparty/libsodium-stable/configure.ac
24@@ -398,11 +398,6 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
25 have_armcrypto=no
26 AC_MSG_CHECKING(for ARM crypto instructions set)
27 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
28- #ifdef __clang__
29- # pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
30- #elif defined(__GNUC__)
31- # pragma GCC target("+simd+crypto")
32- #endif
33 #ifndef __ARM_FEATURE_CRYPTO
34 # define __ARM_FEATURE_CRYPTO 1
35 #endif
36@@ -411,6 +406,12 @@ AS_IF([test "x$EMSCRIPTEN" = "x"], [
37 #endif
38
39 #include <arm_neon.h>
40+
41+ #ifdef __clang__
42+ # pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
43+ #elif defined(__GNUC__)
44+ # pragma GCC target("+simd+crypto")
45+ #endif
46 ]], [[
47 vaeseq_u8(vmovq_n_u8(0), vmovq_n_u8(0));
48
49diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
50index 825de8a1c..a01f60cbe 100644
51--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
52+++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis128l/aegis128l_armcrypto.c
53@@ -17,12 +17,6 @@
54
55 #include "aegis128l_armcrypto.h"
56
57-#ifdef __clang__
58-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
59-#elif defined(__GNUC__)
60-#pragma GCC target("+simd+crypto")
61-#endif
62-
63 #ifndef __ARM_FEATURE_CRYPTO
64 #define __ARM_FEATURE_CRYPTO 1
65 #endif
66@@ -32,6 +26,12 @@
67
68 #include <arm_neon.h>
69
70+#ifdef __clang__
71+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
72+#elif defined(__GNUC__)
73+#pragma GCC target("+simd+crypto")
74+#endif
75+
76 #define AES_BLOCK_LENGTH 16
77
78 typedef uint8x16_t aes_block_t;
79diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
80index e1ebd577a..058e2072b 100644
81--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
82+++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aegis256/aegis256_armcrypto.c
83@@ -17,12 +17,6 @@
84
85 #include "aegis256_armcrypto.h"
86
87-#ifdef __clang__
88-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
89-#elif defined(__GNUC__)
90-#pragma GCC target("+simd+crypto")
91-#endif
92-
93 #ifndef __ARM_FEATURE_CRYPTO
94 #define __ARM_FEATURE_CRYPTO 1
95 #endif
96@@ -32,6 +26,12 @@
97
98 #include <arm_neon.h>
99
100+#ifdef __clang__
101+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
102+#elif defined(__GNUC__)
103+#pragma GCC target("+simd+crypto")
104+#endif
105+
106 #define AES_BLOCK_LENGTH 16
107
108 typedef uint8x16_t aes_block_t;
109diff --git a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
110index 0a5a12811..aa76f5cd1 100644
111--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
112+++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
113@@ -19,12 +19,6 @@
114 #define __vectorcall
115 #endif
116
117-#ifdef __clang__
118-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
119-#elif defined(__GNUC__)
120-#pragma GCC target("+simd+crypto")
121-#endif
122-
123 #ifndef __ARM_FEATURE_CRYPTO
124 #define __ARM_FEATURE_CRYPTO 1
125 #endif
126@@ -34,6 +28,12 @@
127
128 #include <arm_neon.h>
129
130+#ifdef __clang__
131+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
132+#elif defined(__GNUC__)
133+#pragma GCC target("+simd+crypto")
134+#endif
135+
136 #define ABYTES crypto_aead_aes256gcm_ABYTES
137 #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES
138 #define KEYBYTES crypto_aead_aes256gcm_KEYBYTES
139--
1402.34.1
141
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch b/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch
deleted file mode 100644
index c2c51148f6..0000000000
--- a/meta-oe/recipes-extended/minifi-cpp/files/0008-libsodium-aarch64_crypto.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Move target #pragma after arm_neon.h include
2
3Fix per android/ndk#1945
4
5If the pragma is done before the header include,
6when using clang compiler attribute may apply to the functions in arm_neon.h
7
8Upstream-Status: Submitted [https://github.com/jedisct1/libsodium/pull/1321]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- a/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
12+++ b/thirdparty/libsodium-stable/src/libsodium/crypto_aead/aes256gcm/armcrypto/aead_aes256gcm_armcrypto.c
13@@ -19,12 +19,6 @@
14 #define __vectorcall
15 #endif
16
17-#ifdef __clang__
18-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
19-#elif defined(__GNUC__)
20-#pragma GCC target("+simd+crypto")
21-#endif
22-
23 #ifndef __ARM_FEATURE_CRYPTO
24 #define __ARM_FEATURE_CRYPTO 1
25 #endif
26@@ -34,6 +28,12 @@
27
28 #include <arm_neon.h>
29
30+#ifdef __clang__
31+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
32+#elif defined(__GNUC__)
33+#pragma GCC target("+simd+crypto")
34+#endif
35+
36 #define ABYTES crypto_aead_aes256gcm_ABYTES
37 #define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES
38 #define KEYBYTES crypto_aead_aes256gcm_KEYBYTES
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 18:23:30 +0000