Complete Yocto mirror with license table for TQMa6UL (2038-compliance)
- 264 license table entries with exact download URLs (224/264 resolved) - Complete sources/ directory with all BitBake recipes - Build configuration: tqma6ul-multi-mba6ulx, spaetzle (musl) - Full traceability for Softwarefreigabeantrag - GCC 13.4.0, Linux 6.6.102, U-Boot 2023.04, musl 1.2.4 - License distribution: GPL-2.0 (24), MIT (23), GPL-2.0+ (18), BSD-3 (16)
This commit is contained in:
Siggi (OpenClaw Agent)
@@ -0,0 +1,108 @@
|
||||
From 65923a872e44cb461ef1a03374057351f0bc5efe Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Tue, 19 Mar 2024 19:39:04 +0800
|
||||
Subject: [PATCH] Do not use bundled packages
|
||||
|
||||
Use external dependencies for openssl, curl, bzip2, zlib, libarchive,
|
||||
xz, yaml-cpp and libxml2.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
CMakeLists.txt | 23 ++++++-----------------
|
||||
extensions/libarchive/CMakeLists.txt | 7 ++-----
|
||||
2 files changed, 8 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 13a2b992..8a1dd6d9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -222,9 +222,7 @@ else()
|
||||
endif()
|
||||
|
||||
if (NOT DISABLE_BZIP2 AND (NOT DISABLE_LIBARCHIVE OR (NOT DISABLE_ROCKSDB AND NOT WIN32)))
|
||||
- include(BundledBZip2)
|
||||
- use_bundled_bzip2(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
|
||||
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/bzip2/dummy")
|
||||
+ find_package(BZip2 REQUIRED)
|
||||
endif()
|
||||
|
||||
if(NOT WIN32)
|
||||
@@ -247,9 +245,7 @@ endif()
|
||||
|
||||
# OpenSSL
|
||||
if (NOT OPENSSL_OFF)
|
||||
- include(BundledOpenSSL)
|
||||
- use_openssl("${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}")
|
||||
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/ssl")
|
||||
+ find_package(OpenSSL REQUIRED)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENSSL_SUPPORT")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENSSL_SUPPORT")
|
||||
@@ -262,9 +258,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSODIUM_STATIC=1")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSODIUM_STATIC=1")
|
||||
|
||||
# zlib
|
||||
-include(BundledZLIB)
|
||||
-use_bundled_zlib(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/zlib/dummy")
|
||||
+find_package(ZLIB REQUIRED)
|
||||
|
||||
# uthash
|
||||
add_library(ut INTERFACE)
|
||||
@@ -272,9 +266,7 @@ target_include_directories(ut SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/thir
|
||||
|
||||
# cURL
|
||||
if(NOT DISABLE_CURL)
|
||||
- include(BundledLibcURL)
|
||||
- use_bundled_curl(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/curl/dummy")
|
||||
+ find_package(CURL REQUIRED)
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDISABLE_CURL")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_CURL")
|
||||
@@ -285,8 +277,7 @@ include(BundledSpdlog)
|
||||
use_bundled_spdlog(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
# yaml-cpp
|
||||
-include(BundledYamlCpp)
|
||||
-use_bundled_yamlcpp(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
+find_package(yaml-cpp REQUIRED)
|
||||
|
||||
# concurrentqueue
|
||||
add_library(concurrentqueue INTERFACE)
|
||||
@@ -357,9 +348,7 @@ include(Extensions)
|
||||
add_subdirectory(libminifi)
|
||||
|
||||
if ((ENABLE_OPENWSMAN AND NOT DISABLE_CIVET AND NOT DISABLE_CURL) OR ENABLE_ALL OR ENABLE_AZURE)
|
||||
- include(BundledLibXml2)
|
||||
- use_bundled_libxml2(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/libxml2/dummy")
|
||||
+ find_package(LibXml2 REQUIRED)
|
||||
endif()
|
||||
|
||||
if (ENABLE_ALL OR ENABLE_PROMETHEUS OR NOT DISABLE_CIVET)
|
||||
diff --git a/extensions/libarchive/CMakeLists.txt b/extensions/libarchive/CMakeLists.txt
|
||||
index 2b89d3ea..49e13e21 100644
|
||||
--- a/extensions/libarchive/CMakeLists.txt
|
||||
+++ b/extensions/libarchive/CMakeLists.txt
|
||||
@@ -22,13 +22,10 @@ if (DISABLE_LIBARCHIVE)
|
||||
endif()
|
||||
|
||||
if (NOT DISABLE_LZMA)
|
||||
- include(BundledLibLZMA)
|
||||
- use_bundled_liblzma(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
|
||||
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/liblzma/dummy")
|
||||
+ find_package(LibLZMA REQUIRED)
|
||||
endif()
|
||||
|
||||
-include(BundledLibArchive)
|
||||
-use_bundled_libarchive(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
|
||||
+find_package(LibArchive REQUIRED)
|
||||
|
||||
include(${CMAKE_SOURCE_DIR}/extensions/ExtensionHeader.txt)
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
From 4e8e1943541d3b887ba86dc1b488cbb058c7d1cd 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 c4fa1523..1faf2e5c 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"
|
||||
@@ -39,7 +41,7 @@ function(use_bundled_osspuuid SOURCE_DIR BINARY_DIR)
|
||||
ENDFOREACH(BYPRODUCT)
|
||||
|
||||
# Build project
|
||||
- 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")
|
||||
+ 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(NOT build_type MATCHES debug)
|
||||
list(APPEND CONFIGURE_COMMAND --enable-debug=yes)
|
||||
@@ -47,10 +49,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 00000000..b8d7b0bb
|
||||
--- /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.25.1
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From 8a5fe73f722718aa5c9a467c28a26913771f7208 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Tue, 19 Mar 2024 20:57:37 +0800
|
||||
Subject: [PATCH] Fix spdlog build
|
||||
|
||||
* Specify CMAKE_INSTALL_LIBDIR to fix multilib build.
|
||||
* Do not download spdlog source during compile.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
cmake/BundledSpdlog.cmake | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmake/BundledSpdlog.cmake b/cmake/BundledSpdlog.cmake
|
||||
index 974cbbaa..c0c45688 100644
|
||||
--- a/cmake/BundledSpdlog.cmake
|
||||
+++ b/cmake/BundledSpdlog.cmake
|
||||
@@ -35,11 +35,12 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
|
||||
endif()
|
||||
|
||||
# Set build options
|
||||
- set(SPDLOG_SOURCE_DIR "${BINARY_DIR}/thirdparty/spdlog-src")
|
||||
+ set(SPDLOG_SOURCE_DIR "${SOURCE_DIR}/thirdparty/spdlog-src")
|
||||
set(SPDLOG_INSTALL_DIR "${BINARY_DIR}/thirdparty/spdlog-install")
|
||||
set(SPDLOG_LIBRARY "${SPDLOG_INSTALL_DIR}/${BYPRODUCT}")
|
||||
set(SPDLOG_CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
|
||||
"-DCMAKE_INSTALL_PREFIX=${SPDLOG_INSTALL_DIR}"
|
||||
+ "-DCMAKE_INSTALL_LIBDIR=${LIBDIR}"
|
||||
"-DSPDLOG_BUILD_EXAMPLE=OFF"
|
||||
"-DSPDLOG_BUILD_TESTS=OFF"
|
||||
"-DSPDLOG_BUILD_TESTING=OFF"
|
||||
@@ -49,7 +50,6 @@ function(use_bundled_spdlog SOURCE_DIR BINARY_DIR)
|
||||
# Build project
|
||||
ExternalProject_Add(
|
||||
spdlog-external
|
||||
- URL "https://github.com/gabime/spdlog/archive/v1.8.0.zip"
|
||||
SOURCE_DIR "${SPDLOG_SOURCE_DIR}"
|
||||
CMAKE_ARGS ${SPDLOG_CMAKE_ARGS}
|
||||
BUILD_BYPRODUCTS "${SPDLOG_LIBRARY}"
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 083babbd6c6cc6f31530fbac0227c1d426fb0863 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Tue, 19 Mar 2024 21:00:59 +0800
|
||||
Subject: [PATCH] Pass --noline flag to flex
|
||||
|
||||
This ensures that line directive is not emitted into lexer output which
|
||||
could be absolute build paths.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
extensions/expression-language/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/extensions/expression-language/CMakeLists.txt b/extensions/expression-language/CMakeLists.txt
|
||||
index 775b4116..84edc617 100644
|
||||
--- a/extensions/expression-language/CMakeLists.txt
|
||||
+++ b/extensions/expression-language/CMakeLists.txt
|
||||
@@ -77,7 +77,7 @@ flex_target(
|
||||
el-scanner
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/Scanner.ll
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/Scanner.cpp
|
||||
- COMPILE_FLAGS --c++
|
||||
+ COMPILE_FLAGS "--c++ --noline"
|
||||
)
|
||||
|
||||
add_flex_bison_dependency(el-scanner el-parser)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 08d1b4b66fedde97eefb5e3ff6aa98fd02be7c21 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Wed, 20 Mar 2024 10:03:14 +0800
|
||||
Subject: [PATCH] OsUtils.h: add missing header <cstdint> for int64_t
|
||||
|
||||
Fix build with musl:
|
||||
libminifi/include/utils/OsUtils.h:31:1: error: 'int64_t' does not name a type
|
||||
31 | int64_t getCurrentProcessPhysicalMemoryUsage();
|
||||
| ^~~~~~~
|
||||
libminifi/include/utils/OsUtils.h:22:1: note: 'int64_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
|
||||
21 | #include <system_error>
|
||||
+++ |+#include <cstdint>
|
||||
22 |
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
libminifi/include/utils/OsUtils.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libminifi/include/utils/OsUtils.h b/libminifi/include/utils/OsUtils.h
|
||||
index a7117233..5e623d1a 100644
|
||||
--- a/libminifi/include/utils/OsUtils.h
|
||||
+++ b/libminifi/include/utils/OsUtils.h
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <string>
|
||||
#include <optional>
|
||||
#include <system_error>
|
||||
+#include <cstdint>
|
||||
|
||||
struct sockaddr;
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From 44867a8e4100a7296b98e0e850d950d24b980959 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Thu, 21 Mar 2024 10:18:39 +0800
|
||||
Subject: [PATCH] CMakeLists.txt: do not use ccache
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
CMakeLists.txt | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8a1dd6d91..8a5314544 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -82,12 +82,12 @@ if (USE_REAL_ODBC_TEST_DRIVER)
|
||||
endif()
|
||||
|
||||
# Use ccache if present
|
||||
-find_program(CCACHE_FOUND ccache)
|
||||
-if(CCACHE_FOUND)
|
||||
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
|
||||
- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
|
||||
- message("-- Found ccache: ${CCACHE_FOUND}")
|
||||
-endif(CCACHE_FOUND)
|
||||
+#find_program(CCACHE_FOUND ccache)
|
||||
+#if(CCACHE_FOUND)
|
||||
+# set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
|
||||
+# set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
|
||||
+# message("-- Found ccache: ${CCACHE_FOUND}")
|
||||
+#endif(CCACHE_FOUND)
|
||||
|
||||
# Use gold linker if instructed
|
||||
if (UNIX AND USE_GOLD_LINKER AND NOT APPLE )
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
Move target #pragma after arm_neon.h include
|
||||
|
||||
Fix per android/ndk#1945
|
||||
|
||||
If the pragma is done before the header include,
|
||||
when using clang compiler attribute may apply to the functions in arm_neon.h
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/jedisct1/libsodium/pull/1321]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
--- 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
|
||||
@@ -19,12 +19,6 @@
|
||||
#define __vectorcall
|
||||
#endif
|
||||
|
||||
-#ifdef __clang__
|
||||
-#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
|
||||
-#elif defined(__GNUC__)
|
||||
-#pragma GCC target("+simd+crypto")
|
||||
-#endif
|
||||
-
|
||||
#ifndef __ARM_FEATURE_CRYPTO
|
||||
#define __ARM_FEATURE_CRYPTO 1
|
||||
#endif
|
||||
@@ -34,6 +28,12 @@
|
||||
|
||||
#include <arm_neon.h>
|
||||
|
||||
+#ifdef __clang__
|
||||
+#pragma clang attribute push(__attribute__((target("neon,crypto,aes"))), apply_to = function)
|
||||
+#elif defined(__GNUC__)
|
||||
+#pragma GCC target("+simd+crypto")
|
||||
+#endif
|
||||
+
|
||||
#define ABYTES crypto_aead_aes256gcm_ABYTES
|
||||
#define NPUBBYTES crypto_aead_aes256gcm_NPUBBYTES
|
||||
#define KEYBYTES crypto_aead_aes256gcm_KEYBYTES
|
||||
@@ -0,0 +1 @@
|
||||
d @MINIFI_LOG@ 0755 root root -
|
||||
@@ -0,0 +1 @@
|
||||
d root root 0755 @MINIFI_LOG@ none
|
||||
Reference in New Issue
Block a user