MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-15 14:56:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

avro-c,avro-c++: Upgrade to 1.12.1 release

Browse Source 
The patches are no longer needed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2025-10-24 10:18:47 -07:00
parent 7ad3381a2b
commit acd66e872a
5 changed files with 7 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch
View File

@ -1,99 +0,0 @@
From d75f0c5e7a51c9874edad0ea60957e006fb6def5 Mon Sep 17 00:00:00 2001
From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
Date: Mon, 7 Jul 2025 16:58:30 +0300
Subject: [PATCH] Remove cpp unittest compilation
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
---
lang/c++/CMakeLists.txt | 65 -----------------------------------------
1 file changed, 65 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19059a41b..1f5f98c83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,39 +149,6 @@ set_target_properties (avrocpp_s PROPERTIES
target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} fmt::fmt-header-only)
target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
-add_executable (precompile test/precompile.cc)
-
-target_link_libraries (precompile avrocpp_s)
-
-macro (gen file ns)
- add_custom_command (OUTPUT ${file}.hh
- COMMAND avrogencpp
- -p -
- -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}
- -o ${file}.hh -n ${ns}
- DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file})
- add_custom_target (${file}_hh DEPENDS ${file}.hh)
-endmacro (gen)
-
-gen (empty_record empty)
-gen (bigrecord testgen)
-gen (bigrecord_r testgen_r)
-gen (bigrecord2 testgen2)
-gen (tweet testgen3)
-gen (union_array_union uau)
-gen (union_map_union umu)
-gen (union_conflict uc)
-gen (union_empty_record uer)
-gen (recursive rec)
-gen (reuse ru)
-gen (circulardep cd)
-gen (tree1 tr1)
-gen (tree2 tr2)
-gen (crossref cr)
-gen (primitivetypes pt)
-gen (cpp_reserved_words cppres)
-gen (cpp_reserved_words_union_typedef cppres_union)
-
add_executable (avrogencpp impl/avrogencpp.cc)
target_link_libraries (avrogencpp avrocpp_s)
@@ -194,38 +161,6 @@ target_include_directories(avrocpp PUBLIC
$<INSTALL_INTERFACE:include>
)
-enable_testing()
-
-macro (unittest name)
- add_executable (${name} test/${name}.cc)
- target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
- add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
-endmacro (unittest)
-
-unittest (buffertest)
-unittest (unittest)
-unittest (SchemaTests)
-unittest (LargeSchemaTests)
-unittest (CodecTests)
-unittest (StreamTests)
-unittest (SpecificTests)
-unittest (DataFileTests)
-unittest (JsonTests)
-unittest (AvrogencppTests)
-unittest (CompilerTests)
-unittest (AvrogencppTestReservedWords)
-unittest (CommonsSchemasTests)
-
-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
-
-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
- tweet_hh
- union_array_union_hh union_map_union_hh union_conflict_hh
- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
- primitivetypes_hh empty_record_hh cpp_reserved_words_union_typedef_hh
- union_empty_record_hh)
-
include (InstallRequiredSystemLibraries)
set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
--
2.43.0

49
meta-oe/recipes-support/avro/avro-c++/0001-cmake-Port-to-work-with-boost-1.89.patch
View File

@ -1,49 +0,0 @@
From f7c76ff3d693e6df5693fcd2864101b9913b1a44 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 30 Aug 2025 18:16:10 -0700
Subject: [PATCH] cmake: Port to work with boost 1.89+
boost 1.88 does not have boost system libs anymore
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
CMakeLists.txt | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73596a6..42f4225 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,17 +80,20 @@ endif ()
find_package (Boost 1.38 REQUIRED
- COMPONENTS filesystem iostreams program_options regex system)
-
-include(FetchContent)
-FetchContent_Declare(
- fmt
- GIT_REPOSITORY https://github.com/fmtlib/fmt.git
- GIT_TAG 10.2.1
- GIT_PROGRESS TRUE
- USES_TERMINAL_DOWNLOAD TRUE
-)
-FetchContent_MakeAvailable(fmt)
+ COMPONENTS filesystem iostreams program_options regex)
+
+find_package(fmt)
+if (NOT fmt_FOUND)
+ include(FetchContent)
+ FetchContent_Declare(
+ fmt
+ GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+ GIT_TAG 10.2.1
+ GIT_PROGRESS TRUE
+ USES_TERMINAL_DOWNLOAD TRUE
+ )
+ FetchContent_MakeAvailable(fmt)
+endif (NOT fmt_FOUND)
find_package(Snappy)
if (SNAPPY_FOUND)

90
meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch
View File

@ -1,90 +0,0 @@
From 01a29c294c898cf6e13fb500b8514e9982982e1f Mon Sep 17 00:00:00 2001
From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
Date: Mon, 7 Jul 2025 18:16:35 +0300
Subject: [PATCH] Add package configuration files
Upstream-Status: Pending
Signed-off-by: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
---
lang/c++/CMakeLists.txt | 46 ++++++++++++++++++++++++------
lang/c++/cmake/AvroCppConfig.cmake | 5 ++++
2 files changed, 43 insertions(+), 8 deletions(-)
create mode 100644 lang/c++/cmake/AvroCppConfig.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f5f98c83..73596a6cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,18 +167,48 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
include (CPack)
-install (TARGETS avrocpp avrocpp_s
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
- RUNTIME DESTINATION lib)
-
-install (TARGETS avrogencpp RUNTIME DESTINATION bin)
-
-install (DIRECTORY include/avro DESTINATION include
+install(TARGETS avrocpp
+ EXPORT AvroCppTargets
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+install(TARGETS avrogencpp
+ EXPORT AvroCppTargets
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+install(DIRECTORY include/avro DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING PATTERN *.hh)
+
if (NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE Release CACHE STRING
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
FORCE)
endif (NOT CMAKE_BUILD_TYPE)
+
+# Create cmake config files
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake"
+ VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH}
+ COMPATIBILITY AnyNewerVersion
+)
+
+configure_file(cmake/AvroCppConfig.cmake
+ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfig.cmake"
+ COPYONLY
+)
+
+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/avrocpp)
+install(EXPORT AvroCppTargets
+ FILE AvroCppTargets.cmake
+ NAMESPACE AvroCpp::
+ DESTINATION ${ConfigPackageLocation}
+)
+install(FILES
+ "cmake/AvroCppConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake"
+ DESTINATION ${ConfigPackageLocation}
+ COMPONENT Devel)
diff --git a/lang/c++/cmake/AvroCppConfig.cmake b/lang/c++/cmake/AvroCppConfig.cmake
new file mode 100644
index 000000000..deb8aaa31
--- /dev/null
+++ b/cmake/AvroCppConfig.cmake
@@ -0,0 +1,5 @@
+include(CMakeFindDependencyMacro)
+find_dependency(Boost 1.38 REQUIRED
+ COMPONENTS filesystem iostreams program_options regex system)
+
+include("${CMAKE_CURRENT_LIST_DIR}/AvroCppTargets.cmake")
--
2.43.0

14
meta-oe/recipes-support/avro/avro-c++_1.12.bb → meta-oe/recipes-support/avro/avro-c++_1.12.1.bb
View File

@ -7,15 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34cb96edab958a981837bf6f44bf654d"
DEPENDS = "boost"
SRC_URI = "git://github.com/apache/avro.git;branch=branch-1.12;protocol=https;name=avro-c++ \
git://github.com/fmtlib/fmt.git;branch=10.x;protocol=https;name=fmt;destsuffix=_deps/fmt-src \
file://0001-Remove-cpp-unittest-compilation.patch \
file://0002-Add-package-configuration-files.patch \
file://0001-cmake-Port-to-work-with-boost-1.89.patch \
"
SRC_URI = "git://github.com/apache/avro.git;branch=branch-1.12;protocol=https;name=avro-c++;tag=release-${PV} \
git://github.com/fmtlib/fmt.git;branch=10.x;protocol=https;name=fmt;destsuffix=_deps/fmt-src \
"
SRCREV_FORMAT = "avro-c++ fmt"
SRCREV_avro-c++ = "8c27801dc8d42ccc00997f25c0b8f45f8d4a233e"
SRCREV_FORMAT = "avro-c++_fmt"
SRCREV_avro-c++ = "9110c693767c1dde2665b2b57939333478b12036"
# Tag 10.2.1
SRCREV_fmt = "e69e5f977d458f2650bb346dadf2ad30c5320281"
@ -23,6 +20,7 @@ S = "${UNPACKDIR}/${BP}/lang/c++"
inherit cmake pkgconfig
EXTRA_OECMAKE += "-DAVRO_BUILD_TESTS=OFF"
do_configure:prepend() {
install -d ${B}/_deps
cp -r ${UNPACKDIR}/_deps/fmt-src ${B}/_deps/

2
meta-oe/recipes-support/avro/avro-c_1.12.0.bb → meta-oe/recipes-support/avro/avro-c_1.12.1.bb
View File

@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae"
DEPENDS = "jansson zlib xz"
BRANCH = "branch-1.12"
SRCREV = "8c27801dc8d42ccc00997f25c0b8f45f8d4a233e"
SRCREV = "9110c693767c1dde2665b2b57939333478b12036"
SRC_URI = " \
git://github.com/apache/avro;branch=${BRANCH};protocol=https;tag=release-${PV} \
"