CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

minifi-cpp: Backport patch to support builds with CMake 4+

Browse Source 
There hasn't been a new upstream release yet that ships the required changes.

Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Moritz Haase 2025-07-14 13:26:35 +02:00 committed by Khem Raj
parent 86d80eeb39
commit b72fb993b3
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-oe/recipes-extended/minifi-cpp/files/0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch Normal file
View File

@ -0,0 +1,42 @@
From 905676309a407b9a50118b31370b73ec411a6f8b Mon Sep 17 00:00:00 2001
From: Marton Szasz <szaszm@apache.org>
Date: Mon, 31 Mar 2025 14:48:01 +0200
Subject: [PATCH] MINIFICPP-2553 CMP0065=OLD removed in cmake 4.0, removed
override
Signed-off-by: Marton Szasz <szaszm@apache.org>
Signed-off-by: Gabor Gyimesi <gamezbird@gmail.com>
This closes #1957
Upstream-Status: Backport [26aea0d8280986713b441cda3fd3858c80d21f65]
Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
---
CMakeLists.txt | 1 -
minifi_main/CMakeLists.txt | 1 -
2 files changed, 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70c94c2f..6673e331 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@
cmake_minimum_required(VERSION 3.24)
cmake_policy(SET CMP0096 NEW) # policy to preserve the leading zeros in PROJECT_VERSION_{MAJOR,MINOR,PATCH,TWEAK}
-cmake_policy(SET CMP0065 OLD) # default export policy, required for self-dlopen
cmake_policy(SET CMP0135 NEW) # policy to set the timestamps of extracted contents to the time of extraction
project(nifi-minifi-cpp VERSION 0.99.1)
diff --git a/minifi_main/CMakeLists.txt b/minifi_main/CMakeLists.txt
index 62eb234f..1a2e9e0e 100644
--- a/minifi_main/CMakeLists.txt
+++ b/minifi_main/CMakeLists.txt
@@ -69,7 +69,6 @@ target_link_libraries(minifiexe spdlog libsodium gsl-lite argparse ${LIBMINIFI})
set_target_properties(minifiexe PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
set_target_properties(minifiexe PROPERTIES OUTPUT_NAME minifi)
-set_target_properties(minifiexe PROPERTIES ENABLE_EXPORTS True)
if (WIN32)
target_compile_definitions(minifiexe PUBLIC SERVICE_NAME="Apache NiFi MINiFi")
endif()

1
meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.99.1.bb
View File

@ -26,6 +26,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;protocol=https;branch=mai
file://0005-generateVersion.sh-set-correct-buildrev.patch \
file://0006-CMakeLists.txt-do-not-use-ccache.patch \
file://0007-libsodium-aarch64-set-compiler-attributes-after-including-arm_.patch \
file://0008-MINIFICPP-2553-CMP0065-OLD-removed-in-cmake-4.0-remo.patch \
file://systemd-volatile.conf \
file://sysvinit-volatile.conf \
"