mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

minifi-cpp: fix fmt branch and retarget gcc-16 patch

Browse Source 
fmt renamed its default branch master -> main, so the SRCREV was
unreachable.

Also retarget 0001-Fix-build-with-gcc-16 to
minifi-api/include/minifi-cpp/core/RepositoryMetricsSource.h after
the source-tree restructure in 0.99.2.

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Khem Raj
2026-06-24 09:58:23 -07:00
parent d532bde920
commit caf16b5558
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/minifi-cpp/files/0001-Fix-build-with-gcc-16.patch
+5 -5
View File
@@ -8,7 +8,7 @@ Fixes:
38 | virtual int getRealtimeUsec(uint64_t* usec_out) noexcept = 0;
| ^~~~~~~~
libminifi/include/core/RepositoryMetricsSource.h:29:5: error: 'uint64_t' does not name a type
minifi-api/include/minifi-cpp/core/RepositoryMetricsSource.h:29:5: error: 'uint64_t' does not name a type
| 29 | uint64_t table_readers_size{};
| | ^~~~~~~~
@@ -17,7 +17,7 @@ Upstream-Status: Submitted [https://github.com/apache/nifi-minifi-cpp/pull/2194]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
extensions/systemd/libwrapper/LibWrapper.h | 1 +
libminifi/include/core/RepositoryMetricsSource.h | 1 +
minifi-api/include/minifi-cpp/core/RepositoryMetricsSource.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/extensions/systemd/libwrapper/LibWrapper.h b/extensions/systemd/libwrapper/LibWrapper.h
@@ -32,10 +32,10 @@ index d7e7b7c..c8af00e 100644
#include "../Common.h"
#include "utils/gsl.h"
diff --git a/libminifi/include/core/RepositoryMetricsSource.h b/libminifi/include/core/RepositoryMetricsSource.h
diff --git a/minifi-api/include/minifi-cpp/core/RepositoryMetricsSource.h b/minifi-api/include/minifi-cpp/core/RepositoryMetricsSource.h
index 6c933b7..f39fccf 100644
--- a/libminifi/include/core/RepositoryMetricsSource.h
+++ b/libminifi/include/core/RepositoryMetricsSource.h
--- a/minifi-api/include/minifi-cpp/core/RepositoryMetricsSource.h
+++ b/minifi-api/include/minifi-cpp/core/RepositoryMetricsSource.h
@@ -20,6 +20,7 @@
#include <string>
meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.2.bb
+1 -1
View File
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai
git://github.com/gsl-lite/gsl-lite.git;protocol=https;branch=master;name=gsl-lite;destsuffix=${S}/thirdparty/gsl-lite-src \
git://github.com/HowardHinnant/date.git;protocol=https;branch=master;name=date;destsuffix=${S}/thirdparty/date-src \
git://github.com/chriskohlhoff/asio.git;protocol=https;branch=master;name=asio;destsuffix=${S}/thirdparty/asio-src \
git://github.com/fmtlib/fmt.git;protocol=https;branch=master;name=fmt;destsuffix=${S}/thirdparty/fmt-src \
git://github.com/fmtlib/fmt.git;protocol=https;branch=main;name=fmt;destsuffix=${S}/thirdparty/fmt-src \
git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;tag=v1.15.3;name=spdlog;destsuffix=${S}/thirdparty/spdlog-src \
git://github.com/danielaparker/jsoncons.git;protocol=https;branch=master;name=jsoncons;destsuffix=${S}/thirdparty/jsoncons-src \
${DEBIAN_MIRROR}/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz;name=ossp-uuid;subdir=${S}/thirdparty \