diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files | |
parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch b/meta-openembedded/meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-libc.patch new file mode 100644 index 000000000..c1c118196 --- /dev/null +++ b/meta-openembedded/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 + |