added my Recipes
This commit is contained in:
@@ -0,0 +1,39 @@
|
||||
From 609e1745d26d6f42d426018a4dd8d2342d6fc170 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 18 Aug 2020 08:37:57 -0700
|
||||
Subject: [PATCH] Add -lxml2 to linker cmdline of xml is found
|
||||
|
||||
When cross compiling for systems where static libs
|
||||
for libxml are not available cmake's detection mechanism
|
||||
resort to linking with libxml.so but doesnt use -lxml2
|
||||
liblldbHost.a however requires libxml on linker
|
||||
cmdline _after_ itself so its use of symbols from libxml2
|
||||
can be resolved. Here check for libxml2 being detected and
|
||||
add it if its found.
|
||||
|
||||
Fixes
|
||||
minifi-cpp/0.7.0-r0/recipe-sysroot-native/usr/lib/libxml2.so is incompatible with elf32-i386
|
||||
| clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
thirdparty/libarchive-3.3.2/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/thirdparty/libarchive-3.3.2/CMakeLists.txt b/thirdparty/libarchive-3.3.2/CMakeLists.txt
|
||||
index 0c1ea6f7..cde0cc51 100644
|
||||
--- a/thirdparty/libarchive-3.3.2/CMakeLists.txt
|
||||
+++ b/thirdparty/libarchive-3.3.2/CMakeLists.txt
|
||||
@@ -1031,7 +1031,7 @@ ENDIF()
|
||||
IF(LIBXML2_FOUND)
|
||||
CMAKE_PUSH_CHECK_STATE() # Save the state of the variables
|
||||
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
|
||||
- LIST(APPEND ADDITIONAL_LIBS ${LIBXML2_LIBRARIES})
|
||||
+ LIST(APPEND ADDITIONAL_LIBS xml2)
|
||||
SET(HAVE_LIBXML2 1)
|
||||
# libxml2's include files use iconv.h
|
||||
SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 24 Jan 2023 21:40:43 -0800
|
||||
Subject: [PATCH] Add missing includes <cstdint> and <cstdio>
|
||||
|
||||
This is needed with GCC 13 and newer [1]
|
||||
|
||||
[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
|
||||
|
||||
Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
.../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 +
|
||||
storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 +
|
||||
.../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 +
|
||||
storage/rocksdb/rocksdb/util/slice.cc | 1 +
|
||||
storage/rocksdb/rocksdb/util/string_util.h | 1 +
|
||||
tpool/aio_linux.cc | 1 +
|
||||
6 files changed, 6 insertions(+)
|
||||
|
||||
--- a/thirdparty/rocksdb/include/rocksdb/utilities/checkpoint.h
|
||||
+++ b/thirdparty/rocksdb/include/rocksdb/utilities/checkpoint.h
|
||||
@@ -8,6 +8,7 @@
|
||||
#pragma once
|
||||
#ifndef ROCKSDB_LITE
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include "rocksdb/status.h"
|
||||
|
||||
--- a/thirdparty/rocksdb/util/string_util.h
|
||||
+++ b/thirdparty/rocksdb/util/string_util.h
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
--- a/extensions/expression-language/common/Value.h
|
||||
+++ b/extensions/expression-language/common/Value.h
|
||||
@@ -15,6 +15,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include <iomanip>
|
||||
--- a/libminifi/include/utils/StringUtils.h
|
||||
+++ b/libminifi/include/utils/StringUtils.h
|
||||
@@ -18,6 +18,7 @@
|
||||
#define LIBMINIFI_INCLUDE_IO_STRINGUTILS_H_
|
||||
#include <iostream>
|
||||
#include <cstring>
|
||||
+#include <cstdint>
|
||||
#include <functional>
|
||||
#ifdef WIN32
|
||||
#include <cwctype>
|
||||
--- a/thirdparty/rocksdb/db/compaction_iteration_stats.h
|
||||
+++ b/thirdparty/rocksdb/db/compaction_iteration_stats.h
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <cstdint>
|
||||
struct CompactionIterationStats {
|
||||
// Compaction statistics
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 8d99edeefb23c9d7574a0b5a0e2e3f41b0433490 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Thu, 10 Sep 2020 16:14:10 +0800
|
||||
Subject: [PATCH] CMakeLists.txt: use curl local source tarball
|
||||
|
||||
Do not download curl source during compile.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
CMakeLists.txt | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7cd550fb..215a4ef4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -314,11 +314,7 @@ endif()
|
||||
|
||||
ExternalProject_Add(
|
||||
curl-external
|
||||
- GIT_REPOSITORY "https://github.com/curl/curl.git"
|
||||
- GIT_TAG "f3294d9d86e6a7915a967efff2842089b8b0d071" # Version 7.64.0
|
||||
- SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-src"
|
||||
- LIST_SEPARATOR % # This is needed for passing semicolon-separated lists
|
||||
- TLS_VERIFY OFF
|
||||
+ SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/curl-7.64.0"
|
||||
CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
|
||||
"-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-install"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib${LIBSUFFIX}"
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 6690e7fe566445e20fec178e9e209e5f9f2fdde3 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 5 Apr 2023 23:33:46 -0700
|
||||
Subject: [PATCH] Do not use LFS64 functions on linux/musl
|
||||
|
||||
On musl, off_t is 64bit always ( even on 32bit platforms ), therefore using
|
||||
LFS64 funcitons is not needed on such platforms. Moreover, musl has stopped
|
||||
providing aliases for these functions [1] which means it wont compile on
|
||||
newer musl systems. Therefore only use it on 32bit glibc/linux platforms
|
||||
and exclude musl like cygwin or OSX
|
||||
|
||||
[1] https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d0ef9736d95f4
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/gabime/spdlog/pull/2589]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
thirdparty/spdlog-20170710/include/spdlog/details/os.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/thirdparty/spdlog-20170710/include/spdlog/details/os.h b/thirdparty/spdlog-20170710/include/spdlog/details/os.h
|
||||
index 735f60147..639b07a79 100644
|
||||
--- a/thirdparty/spdlog-20170710/include/spdlog/details/os.h
|
||||
+++ b/thirdparty/spdlog-20170710/include/spdlog/details/os.h
|
||||
@@ -237,7 +237,7 @@ inline size_t filesize(FILE *f)
|
||||
#else // unix
|
||||
int fd = fileno(f);
|
||||
//64 bits(but not in osx, where fstat64 is deprecated)
|
||||
-#if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__))
|
||||
+#if !defined(__FreeBSD__) && !defined(__APPLE__) && ((defined(__x86_64__) || defined(__ppc64__)) && (!defined(__linux__)))
|
||||
struct stat64 st;
|
||||
if (fstat64(fd, &st) == 0)
|
||||
return static_cast<size_t>(st.st_size);
|
||||
--
|
||||
2.40.0
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 72e0fe484444169007e481c9b33d8f78ebe03674 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 27 May 2021 15:44:10 -0700
|
||||
Subject: [PATCH] Fix build with libc++
|
||||
|
||||
In libc++ on 32-bit platforms, int64_t is defined as alias of long long. On 64-bit platforms: long.
|
||||
|
||||
On the other hand in definition of std::chrono::duration aliases, that you can find here long long is used
|
||||
|
||||
Therefore create custom unit to avoid incompatibility between libstdc++
|
||||
and libc++
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
extensions/expression-language/Expression.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/extensions/expression-language/Expression.cpp b/extensions/expression-language/Expression.cpp
|
||||
index a25e1d3f..68d6320c 100644
|
||||
--- a/extensions/expression-language/Expression.cpp
|
||||
+++ b/extensions/expression-language/Expression.cpp
|
||||
@@ -629,7 +629,8 @@ Value expr_toDate(const std::vector<Value> &args) {
|
||||
#endif // EXPRESSION_LANGUAGE_USE_DATE
|
||||
|
||||
Value expr_now(const std::vector<Value> &args) {
|
||||
- return Value(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count());
|
||||
+ using Milliseconds = std::chrono::duration<std::int64_t, std::chrono::milliseconds::period>;
|
||||
+ return Value(std::chrono::duration_cast<Milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count());
|
||||
}
|
||||
|
||||
Value expr_unescapeCsv(const std::vector<Value> &args) {
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 0eee3fb85dad084b6b42f7b219d8aa3a62620a27 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Wed, 28 Oct 2020 09:52:40 +0800
|
||||
Subject: [PATCH] civetweb/CMakeLists.txt: do not search gcc-ar and gcc-ranlib
|
||||
|
||||
Do not search gcc-ar and gcc-ranlib. Specify GCC_AR and GCC_RANLIB in
|
||||
EXTRA_OECMAKE to avoid host contamination.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
thirdparty/civetweb-1.10/CMakeLists.txt | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/thirdparty/civetweb-1.10/CMakeLists.txt b/thirdparty/civetweb-1.10/CMakeLists.txt
|
||||
index f559a04e..0689e3f6 100644
|
||||
--- a/thirdparty/civetweb-1.10/CMakeLists.txt
|
||||
+++ b/thirdparty/civetweb-1.10/CMakeLists.txt
|
||||
@@ -246,11 +246,9 @@ set_property(CACHE CIVETWEB_CXX_STANDARD PROPERTY STRINGS auto c++14 c++11 c++98
|
||||
|
||||
# Configure the linker
|
||||
if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
|
||||
- find_program(GCC_AR gcc-ar)
|
||||
if (GCC_AR)
|
||||
set(CMAKE_AR ${GCC_AR})
|
||||
endif()
|
||||
- find_program(GCC_RANLIB gcc-ranlib)
|
||||
if (GCC_RANLIB)
|
||||
set(CMAKE_RANLIB ${GCC_RANLIB})
|
||||
endif()
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From 120c708d51f72ade4a31d3d8f35bcfad7b12e723 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 6 Sep 2022 20:38:03 -0700
|
||||
Subject: [PATCH] civetweb: Disable lto
|
||||
|
||||
lto does not work everywhere, therefore disable it atleast in the cmake
|
||||
file, we can still enable it via environment
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
thirdparty/civetweb-1.10/CMakeLists.txt | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
--- a/thirdparty/civetweb-1.10/CMakeLists.txt
|
||||
+++ b/thirdparty/civetweb-1.10/CMakeLists.txt
|
||||
@@ -298,7 +298,6 @@ add_c_compiler_flag(/WX)
|
||||
add_c_compiler_flag(-pedantic-errors)
|
||||
add_c_compiler_flag(-fvisibility=hidden)
|
||||
add_c_compiler_flag(-fstack-protector-strong RELEASE)
|
||||
-add_c_compiler_flag(-flto RELEASE)
|
||||
|
||||
add_c_compiler_flag(-fstack-protector-all DEBUG)
|
||||
if (MINGW)
|
||||
@@ -361,7 +360,6 @@ if (CIVETWEB_ENABLE_CXX)
|
||||
add_cxx_compiler_flag(-pedantic-errors)
|
||||
add_cxx_compiler_flag(-fvisibility=hidden)
|
||||
add_cxx_compiler_flag(-fstack-protector-strong RELEASE)
|
||||
- add_cxx_compiler_flag(-flto RELEASE)
|
||||
|
||||
add_cxx_compiler_flag(-fstack-protector-all DEBUG)
|
||||
if (MINGW)
|
||||
@@ -0,0 +1,34 @@
|
||||
From fda0713ce3e07786757a057abe7ebf2146d33780 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 2 Mar 2021 18:31:45 -0800
|
||||
Subject: [PATCH] cxxopts: Add limits header
|
||||
|
||||
needed for numeric_limits
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/apache/nifi-minifi-cpp/pull/1021]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
thirdparty/cxxopts/include/cxxopts.hpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/thirdparty/cxxopts/include/cxxopts.hpp
|
||||
+++ b/thirdparty/cxxopts/include/cxxopts.hpp
|
||||
@@ -29,6 +29,7 @@ THE SOFTWARE.
|
||||
#include <cctype>
|
||||
#include <exception>
|
||||
#include <iostream>
|
||||
+#include <limits>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <regex>
|
||||
--- a/libminifi/src/utils/StringUtils.cpp
|
||||
+++ b/libminifi/src/utils/StringUtils.cpp
|
||||
@@ -21,6 +21,8 @@
|
||||
#include <Windows.h>
|
||||
#endif
|
||||
|
||||
+#include <limits>
|
||||
+
|
||||
namespace org {
|
||||
namespace apache {
|
||||
namespace nifi {
|
||||
@@ -0,0 +1,32 @@
|
||||
From 5a5317044b0039e9e19aabcecb7b666a3f13e136 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Thu, 10 Sep 2020 15:08:19 +0800
|
||||
Subject: [PATCH] cmake/LibreSSL.cmake: use libressl local source tarball
|
||||
|
||||
Do not download libressl source during compile.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
cmake/LibreSSL.cmake | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/LibreSSL.cmake b/cmake/LibreSSL.cmake
|
||||
index 57319e40..bab30129 100644
|
||||
--- a/cmake/LibreSSL.cmake
|
||||
+++ b/cmake/LibreSSL.cmake
|
||||
@@ -43,9 +43,7 @@ function(use_libre_ssl SOURCE_DIR BINARY_DIR)
|
||||
|
||||
ExternalProject_Add(
|
||||
libressl-portable
|
||||
- URL https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://gentoo.osuosl.org/distfiles/libressl-2.8.3.tar.gz
|
||||
- URL_HASH "SHA256=9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477"
|
||||
- SOURCE_DIR "${BINARY_DIR}/thirdparty/libressl-src"
|
||||
+ SOURCE_DIR "${SOURCE_DIR}/thirdparty/libressl-2.8.3"
|
||||
PATCH_COMMAND ${PATCH}
|
||||
CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
|
||||
"-DCMAKE_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/libressl-install"
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 74ade26f7ccd0dbc4ad97cb3082204118a67c92b Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Thu, 10 Sep 2020 15:12:41 +0800
|
||||
Subject: [PATCH] cmake/BundledOSSPUUID.cmake: use ossp-uuid local source
|
||||
tarball
|
||||
|
||||
Do not download ossp-uuid source during compile.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
cmake/BundledOSSPUUID.cmake | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/BundledOSSPUUID.cmake b/cmake/BundledOSSPUUID.cmake
|
||||
index 1103156d..0cf4bac0 100644
|
||||
--- a/cmake/BundledOSSPUUID.cmake
|
||||
+++ b/cmake/BundledOSSPUUID.cmake
|
||||
@@ -47,10 +47,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 ""
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
diff -urN -x .git orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch
|
||||
--- orig/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 1970-01-01 09:00:00.000000000 +0900
|
||||
+++ patched/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch 2020-08-07 23:14:46.196764271 +0900
|
||||
@@ -0,0 +1,30 @@
|
||||
+This patch was imported from the libressl potable.
|
||||
+https://github.com/libressl-portable/portable/commit/a9332ccecfce63bf54924e70c11f420edd3ae312
|
||||
+
|
||||
+From a9332ccecfce63bf54924e70c11f420edd3ae312 Mon Sep 17 00:00:00 2001
|
||||
+From: Brent Cook <bcook@openbsd.org>
|
||||
+Date: Sun, 17 Jul 2016 18:12:23 -0500
|
||||
+Subject: [PATCH] avoid BSWAP assembly for ARM <= v6
|
||||
+
|
||||
+diff -urN orig/crypto/modes/modes_lcl.h patched/crypto/modes/modes_lcl.h
|
||||
+--- orig/crypto/modes/modes_lcl.h 2018-11-18 21:27:10.000000000 +0900
|
||||
++++ patched/crypto/modes/modes_lcl.h 2020-08-07 23:11:01.960764745 +0900
|
||||
+@@ -45,14 +45,16 @@
|
||||
+ asm ("bswapl %0" \
|
||||
+ : "+r"(ret)); ret; })
|
||||
+ # elif (defined(__arm__) || defined(__arm)) && !defined(__STRICT_ALIGNMENT)
|
||||
+-# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \
|
||||
++# if (__ARM_ARCH >= 6)
|
||||
++# define BSWAP8(x) ({ u32 lo=(u64)(x)>>32,hi=(x); \
|
||||
+ asm ("rev %0,%0; rev %1,%1" \
|
||||
+ : "+r"(hi),"+r"(lo)); \
|
||||
+ (u64)hi<<32|lo; })
|
||||
+-# define BSWAP4(x) ({ u32 ret; \
|
||||
++# define BSWAP4(x) ({ u32 ret; \
|
||||
+ asm ("rev %0,%1" \
|
||||
+ : "=r"(ret) : "r"((u32)(x))); \
|
||||
+ ret; })
|
||||
++# endif
|
||||
+ # endif
|
||||
+ #endif
|
||||
+ #endif
|
||||
@@ -0,0 +1,43 @@
|
||||
diff -urN -x .git orig/cmake/LibreSSL.cmake patched/cmake/LibreSSL.cmake
|
||||
--- orig/cmake/LibreSSL.cmake 2020-08-07 21:58:34.660773928 +0900
|
||||
+++ patched/cmake/LibreSSL.cmake 2020-08-07 22:51:18.620767245 +0900
|
||||
@@ -18,6 +18,9 @@
|
||||
function(use_libre_ssl SOURCE_DIR BINARY_DIR)
|
||||
message("Using bundled LibreSSL from release")
|
||||
|
||||
+ find_package(Patch REQUIRED)
|
||||
+ set(PATCH "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/libressl/avoid-BSWAP-assembly-for-ARM-v6.patch")
|
||||
+
|
||||
set(BYPRODUCT_PREFIX "lib" CACHE STRING "" FORCE)
|
||||
set(BYPRODUCT_SUFFIX ".a" CACHE STRING "" FORCE)
|
||||
|
||||
@@ -27,16 +30,29 @@
|
||||
set(BYPRODUCT_PREFIX "" CACHE STRING "" FORCE)
|
||||
set(BUILD_ARGS " -GVisual Studio 15 2017")
|
||||
endif(WIN32)
|
||||
+
|
||||
+ set(BYPRODUCTS
|
||||
+ "lib/${BYPRODUCT_PREFIX}crypto${BYPRODUCT_SUFFIX}"
|
||||
+ "lib/${BYPRODUCT_PREFIX}ssl${BYPRODUCT_SUFFIX}"
|
||||
+ "lib/${BYPRODUCT_PREFIX}tls${BYPRODUCT_SUFFIX}"
|
||||
+ )
|
||||
+ set(LIBRESSL_INSTALL_DIR "${BINARY_DIR}/thirdparty/libressl-install" CACHE STRING "" FORCE)
|
||||
+ FOREACH(BYPRODUCT ${BYPRODUCTS})
|
||||
+ LIST(APPEND LIBRESSL_LIBRARIES_LIST "${LIBRESSL_INSTALL_DIR}/${BYPRODUCT}")
|
||||
+ ENDFOREACH(BYPRODUCT)
|
||||
+
|
||||
ExternalProject_Add(
|
||||
libressl-portable
|
||||
URL https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.8.3.tar.gz https://gentoo.osuosl.org/distfiles/libressl-2.8.3.tar.gz
|
||||
URL_HASH "SHA256=9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477"
|
||||
SOURCE_DIR "${BINARY_DIR}/thirdparty/libressl-src"
|
||||
+ PATCH_COMMAND ${PATCH}
|
||||
CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
|
||||
"-DCMAKE_INSTALL_PREFIX=${BINARY_DIR}/thirdparty/libressl-install"
|
||||
"-DLIBRESSL_APPS=OFF"
|
||||
"-DLIBRESSL_TESTS=OFF"
|
||||
"${BUILD_ARGS}"
|
||||
+ BUILD_BYPRODUCTS ${LIBRESSL_LIBRARIES_LIST}
|
||||
)
|
||||
|
||||
add_library(crypto STATIC IMPORTED)
|
||||
@@ -0,0 +1,60 @@
|
||||
diff -urN -x .git orig/CMakeLists.txt patched/CMakeLists.txt
|
||||
--- orig/CMakeLists.txt 2020-08-07 21:58:34.656773928 +0900
|
||||
+++ patched/CMakeLists.txt 2020-08-10 15:08:31.800278357 +0900
|
||||
@@ -119,13 +119,28 @@
|
||||
endif()
|
||||
endif()
|
||||
|
||||
+include(CheckCXXSourceCompiles)
|
||||
+CHECK_CXX_SOURCE_COMPILES("
|
||||
+ #include <atomic>
|
||||
+ int main(int argc, char **argv) {
|
||||
+ uint8_t m;
|
||||
+ __atomic_load_8(&m, 0);
|
||||
+ __atomic_fetch_add_1(&m , 0, 0);
|
||||
+ return 0;
|
||||
+ }"
|
||||
+ HAVE_ATOMIC
|
||||
+)
|
||||
+if(NOT HAVE_ATOMIC)
|
||||
+ set(LIB_ATOMIC atomic)
|
||||
+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)
|
||||
|
||||
if (UNIX AND USE_GOLD_LINKER AND NOT APPLE )
|
||||
execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE ld_version)
|
||||
@@ -303,8 +318,10 @@
|
||||
GIT_TAG "f3294d9d86e6a7915a967efff2842089b8b0d071" # Version 7.64.0
|
||||
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-src"
|
||||
LIST_SEPARATOR % # This is needed for passing semicolon-separated lists
|
||||
+ TLS_VERIFY OFF
|
||||
CMAKE_ARGS ${PASSTHROUGH_CMAKE_ARGS}
|
||||
"-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/thirdparty/curl-install"
|
||||
+ "-DCMAKE_INSTALL_LIBDIR=lib${LIBSUFFIX}"
|
||||
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
|
||||
-DBUILD_CURL_EXE=OFF
|
||||
-DBUILD_TESTING=OFF
|
||||
diff -urN -x .git orig/libminifi/CMakeLists.txt patched/libminifi/CMakeLists.txt
|
||||
--- orig/libminifi/CMakeLists.txt 2020-08-07 21:58:34.676773928 +0900
|
||||
+++ patched/libminifi/CMakeLists.txt 2020-08-10 15:06:17.124278642 +0900
|
||||
@@ -108,6 +108,7 @@
|
||||
add_library(spdlog STATIC ${SPD_SOURCES})
|
||||
add_library(core-minifi STATIC ${SOURCES})
|
||||
target_link_libraries(core-minifi ${CMAKE_DL_LIBS} yaml-cpp)
|
||||
+target_link_libraries(core-minifi ${LIB_ATOMIC})
|
||||
|
||||
#target_link_libraries(core-minifi PRIVATE bsdiff )
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
diff -urN -x .git orig/cmake/BundledOSSPUUID.cmake patched/cmake/BundledOSSPUUID.cmake
|
||||
--- orig/cmake/BundledOSSPUUID.cmake 2020-08-07 21:58:34.660773928 +0900
|
||||
+++ patched/cmake/BundledOSSPUUID.cmake 2020-08-07 22:05:57.404772993 +0900
|
||||
@@ -22,7 +22,9 @@
|
||||
|
||||
# Define patch step
|
||||
find_package(Patch REQUIRED)
|
||||
- set(PC "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch")
|
||||
+ set(PATCH1 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-mac-fix.patch")
|
||||
+ set(PATCH2 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch")
|
||||
+ set(PATCH3 "${Patch_EXECUTABLE}" -p1 -i "${SOURCE_DIR}/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch")
|
||||
|
||||
# Define byproducts
|
||||
set(BYPRODUCTS "lib/libuuid.a"
|
||||
@@ -35,7 +37,9 @@
|
||||
ENDFOREACH(BYPRODUCT)
|
||||
|
||||
# Build project
|
||||
- set(CONFIGURE_COMMAND ./configure "CFLAGS=-fPIC" "CXXFLAGS=-fPIC" --with-cxx --without-perl --without-php --without-pgsql "--prefix=${BINARY_DIR}/thirdparty/ossp-uuid-install")
|
||||
+ set(CONFIGURE_COMMAND ac_cv_va_copy=C99 ./configure CFLAGS=-fPIC CXXFLAGS=-fPIC --host=${HOST_SYS}
|
||||
+ --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)
|
||||
@@ -52,8 +56,8 @@
|
||||
UPDATE_COMMAND ""
|
||||
INSTALL_COMMAND make install
|
||||
BUILD_BYPRODUCTS ${OSSPUUID_LIBRARIES_LIST}
|
||||
- CONFIGURE_COMMAND ""
|
||||
- PATCH_COMMAND ${PC} && ${CONFIGURE_COMMAND}
|
||||
+ CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
|
||||
+ PATCH_COMMAND ${PATCH1} && ${PATCH2} && ${PATCH3}
|
||||
STEP_TARGETS build
|
||||
EXCLUDE_FROM_ALL TRUE
|
||||
)
|
||||
@@ -0,0 +1,37 @@
|
||||
diff -urN -x .git orig/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch patched/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch
|
||||
--- orig/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 1970-01-01 09:00:00.000000000 +0900
|
||||
+++ patched/thirdparty/ossp-uuid/ossp-uuid-cross-compile-fix.patch 2020-08-07 22:28:04.396770190 +0900
|
||||
@@ -0,0 +1,33 @@
|
||||
+diff -urN orig/config.sub patched/config.sub
|
||||
+--- orig/config.sub 2008-07-05 06:43:08.000000000 +0900
|
||||
++++ patched/config.sub 2020-08-07 22:23:48.412770731 +0900
|
||||
+@@ -238,6 +238,8 @@
|
||||
+ # Some are omitted here because they have special meanings below.
|
||||
+ 1750a | 580 \
|
||||
+ | a29k \
|
||||
++ | aarch64 | aarch64_be \
|
||||
++ | riscv32 | riscv64 \
|
||||
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
+ | am33_2.0 \
|
||||
+@@ -314,6 +316,8 @@
|
||||
+ # Recognize the basic CPU types with company name.
|
||||
+ 580-* \
|
||||
+ | a29k-* \
|
||||
++ | aarch64-* | aarch64_be-* \
|
||||
++ | riscv32-* | riscv64-* \
|
||||
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
||||
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||
+diff -urN orig/shtool patched/shtool
|
||||
+--- orig/shtool 2008-07-05 06:43:08.000000000 +0900
|
||||
++++ patched/shtool 2020-08-07 22:21:23.192771037 +0900
|
||||
+@@ -1400,7 +1400,7 @@
|
||||
+ 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
|
||||
@@ -0,0 +1,25 @@
|
||||
diff -urN -x .git orig/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch patched/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch
|
||||
--- orig/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch 1970-01-01 09:00:00.000000000 +0900
|
||||
+++ patched/thirdparty/ossp-uuid/ossp-uuid-musl-compile-fix.patch 2020-08-07 11:22:49.344854508 +0900
|
||||
@@ -0,0 +1,21 @@
|
||||
+diff -urN orig/config.sub patched/config.sub
|
||||
+--- orig/config.sub 2008-07-05 06:43:08.000000000 +0900
|
||||
++++ patched/config.sub 2020-08-07 11:19:25.948854937 +0900
|
||||
+@@ -120,7 +120,7 @@
|
||||
+ # Here we must recognize all the valid KERNEL-OS combinations.
|
||||
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
+ case $maybe_os in
|
||||
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
||||
++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | linux-musl* | \
|
||||
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
+ storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
+ os=-$maybe_os
|
||||
+@@ -1250,7 +1250,7 @@
|
||||
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
+ | -chorusos* | -chorusrdb* \
|
||||
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
||||
++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* | -linux-musl* \
|
||||
+ | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
@@ -0,0 +1,12 @@
|
||||
diff -urN orig/thirdparty/rocksdb/CMakeLists.txt patched/thirdparty/rocksdb/CMakeLists.txt
|
||||
--- orig/thirdparty/rocksdb/CMakeLists.txt 2020-07-28 11:39:40.254677515 +0900
|
||||
+++ patched/thirdparty/rocksdb/CMakeLists.txt 2020-07-28 11:51:11.898676054 +0900
|
||||
@@ -618,6 +618,7 @@
|
||||
add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES})
|
||||
target_link_libraries(${ROCKSDB_STATIC_LIB}
|
||||
${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
|
||||
+target_link_libraries(${ROCKSDB_STATIC_LIB} ${LIB_ATOMIC})
|
||||
|
||||
if(WIN32)
|
||||
# add_library(${ROCKSDB_IMPORT_LIB} SHARED ${SOURCES})
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
[Unit]
|
||||
Description=MiNiFi Service
|
||||
After=network.target
|
||||
RequiresMountsFor=/var
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
WorkingDirectory=@LOCALSTATEDIR@/lib/minifi
|
||||
Environment=MINIFI_HOME=@SYSCONFDIR@/minifi
|
||||
ExecStart=@BINDIR@/minifi
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,38 @@
|
||||
From bfce136fa9ff1e955928539484ba4dd55f98f05b Mon Sep 17 00:00:00 2001
|
||||
From: Willem Jan Withagen <wjw@digiware.nl>
|
||||
Date: Sun, 16 Aug 2020 23:38:55 +0200
|
||||
Subject: [PATCH] Update channel.h
|
||||
|
||||
Compiling this on FreeBSD with CLang fails due to:
|
||||
```In file included from /usr/ports/net/ceph15/work/ceph-15.2.4/src/rocksdb/utilities/backupable/backupable_db.cc:16:
|
||||
/usr/ports/net/ceph15/work/ceph-15.2.4/src/rocksdb/util/channel.h:35:33: error: no matching constructor for initialization of 'std::lock_guard<std::mutex>'
|
||||
std::lock_guard<std::mutex> lk(lock_);
|
||||
^ ~~~~~
|
||||
/usr/include/c++/v1/__mutex_base:90:14: note: candidate constructor not viable: 1st argument ('const std::mutex') would lose const qualifier
|
||||
explicit lock_guard(mutex_type& __m) _LIBCPP_THREAD_SAFETY_ANNOTATION(acquire_capability(__m))
|
||||
^
|
||||
/usr/include/c++/v1/__mutex_base:100:5: note: candidate constructor not viable: no known conversion from 'const std::mutex' to 'const std::__1::lock_guard<std::__1::mutex>' for 1st argument
|
||||
lock_guard(lock_guard const&) _LIBCPP_EQUAL_DELETE;
|
||||
^
|
||||
/usr/include/c++/v1/__mutex_base:94:5: note: candidate constructor not viable: requires 2 arguments, but 1 was provided
|
||||
lock_guard(mutex_type& __m, adopt_lock_t) _LIBCPP_THREAD_SAFETY_ANNOTATION(requires_capability(__m))
|
||||
^
|
||||
1 error generated.
|
||||
```
|
||||
---
|
||||
thirdparty/rocksdb/util/channel.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/thirdparty/rocksdb/util/channel.h b/thirdparty/rocksdb/util/channel.h
|
||||
index 705fa2d28f..993bef5bc0 100644
|
||||
--- a/thirdparty/rocksdb/util/channel.h
|
||||
+++ b/thirdparty/rocksdb/util/channel.h
|
||||
@@ -31,7 +31,7 @@ class channel {
|
||||
return buffer_.empty() && eof_;
|
||||
}
|
||||
|
||||
- size_t size() const {
|
||||
+ size_t size() {
|
||||
std::lock_guard<std::mutex> lk(lock_);
|
||||
return buffer_.size();
|
||||
}
|
||||
@@ -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