diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-05-27 15:49:12 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-05-28 06:55:34 -0700 |
commit | 5963e955775016bdde386d8907d863af8306f1e9 (patch) | |
tree | 4fbdaeddfef9b44331495fa5d4f45343c507cd07 /meta-oe/recipes-extended/minifi-cpp | |
parent | 3c022cd50d1b176ff53a9f3ec37522753f57a460 (diff) | |
download | meta-openembedded-contrib-5963e955775016bdde386d8907d863af8306f1e9.tar.gz |
minifi-cpp: Fix build with llvm C++ runtime
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/minifi-cpp')
-rw-r--r-- | meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb | 1 |
2 files changed, 37 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch new file mode 100644 index 0000000000..c1c118196a --- /dev/null +++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch @@ -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 + diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb index 322b58477d..86c149ba5b 100644 --- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb @@ -29,6 +29,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \ file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \ file://0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch \ file://0001-cxxopts-Add-limits-header.patch \ + file://0001-Fix-build-with-libc.patch \ file://minifi.service \ file://systemd-volatile.conf \ file://sysvinit-volatile.conf \ |