summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch99
-rw-r--r--meta-oe/recipes-support/avro/avro-c++/0001-cmake-Port-to-work-with-boost-1.89.patch49
-rw-r--r--meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch90
-rw-r--r--meta-oe/recipes-support/avro/avro-c++_1.12.1.bb (renamed from meta-oe/recipes-support/avro/avro-c++_1.12.bb)16
-rw-r--r--meta-oe/recipes-support/avro/avro-c_1.12.1.bb (renamed from meta-oe/recipes-support/avro/avro-c_1.12.0.bb)2
5 files changed, 8 insertions, 248 deletions
diff --git a/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch b/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch
deleted file mode 100644
index f33c653069..0000000000
--- a/meta-oe/recipes-support/avro/avro-c++/0001-Remove-cpp-unittest-compilation.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From d75f0c5e7a51c9874edad0ea60957e006fb6def5 Mon Sep 17 00:00:00 2001
2From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
3Date: Mon, 7 Jul 2025 16:58:30 +0300
4Subject: [PATCH] Remove cpp unittest compilation
5
6Upstream-Status: Inappropriate [oe-specific]
7
8Signed-off-by: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
9Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
10---
11 lang/c++/CMakeLists.txt | 65 -----------------------------------------
12 1 file changed, 65 deletions(-)
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 19059a41b..1f5f98c83 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -149,39 +149,6 @@ set_target_properties (avrocpp_s PROPERTIES
19 target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} fmt::fmt-header-only)
20 target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
21
22-add_executable (precompile test/precompile.cc)
23-
24-target_link_libraries (precompile avrocpp_s)
25-
26-macro (gen file ns)
27- add_custom_command (OUTPUT ${file}.hh
28- COMMAND avrogencpp
29- -p -
30- -i ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file}
31- -o ${file}.hh -n ${ns}
32- DEPENDS avrogencpp ${CMAKE_CURRENT_SOURCE_DIR}/jsonschemas/${file})
33- add_custom_target (${file}_hh DEPENDS ${file}.hh)
34-endmacro (gen)
35-
36-gen (empty_record empty)
37-gen (bigrecord testgen)
38-gen (bigrecord_r testgen_r)
39-gen (bigrecord2 testgen2)
40-gen (tweet testgen3)
41-gen (union_array_union uau)
42-gen (union_map_union umu)
43-gen (union_conflict uc)
44-gen (union_empty_record uer)
45-gen (recursive rec)
46-gen (reuse ru)
47-gen (circulardep cd)
48-gen (tree1 tr1)
49-gen (tree2 tr2)
50-gen (crossref cr)
51-gen (primitivetypes pt)
52-gen (cpp_reserved_words cppres)
53-gen (cpp_reserved_words_union_typedef cppres_union)
54-
55 add_executable (avrogencpp impl/avrogencpp.cc)
56 target_link_libraries (avrogencpp avrocpp_s)
57
58@@ -194,38 +161,6 @@ target_include_directories(avrocpp PUBLIC
59 $<INSTALL_INTERFACE:include>
60 )
61
62-enable_testing()
63-
64-macro (unittest name)
65- add_executable (${name} test/${name}.cc)
66- target_link_libraries (${name} avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})
67- add_test (NAME ${name} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
68- COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${name})
69-endmacro (unittest)
70-
71-unittest (buffertest)
72-unittest (unittest)
73-unittest (SchemaTests)
74-unittest (LargeSchemaTests)
75-unittest (CodecTests)
76-unittest (StreamTests)
77-unittest (SpecificTests)
78-unittest (DataFileTests)
79-unittest (JsonTests)
80-unittest (AvrogencppTests)
81-unittest (CompilerTests)
82-unittest (AvrogencppTestReservedWords)
83-unittest (CommonsSchemasTests)
84-
85-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh)
86-
87-add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh
88- tweet_hh
89- union_array_union_hh union_map_union_hh union_conflict_hh
90- recursive_hh reuse_hh circulardep_hh tree1_hh tree2_hh crossref_hh
91- primitivetypes_hh empty_record_hh cpp_reserved_words_union_typedef_hh
92- union_empty_record_hh)
93-
94 include (InstallRequiredSystemLibraries)
95
96 set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
97--
982.43.0
99
diff --git a/meta-oe/recipes-support/avro/avro-c++/0001-cmake-Port-to-work-with-boost-1.89.patch b/meta-oe/recipes-support/avro/avro-c++/0001-cmake-Port-to-work-with-boost-1.89.patch
deleted file mode 100644
index 0411f2fded..0000000000
--- a/meta-oe/recipes-support/avro/avro-c++/0001-cmake-Port-to-work-with-boost-1.89.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From f7c76ff3d693e6df5693fcd2864101b9913b1a44 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Aug 2025 18:16:10 -0700
4Subject: [PATCH] cmake: Port to work with boost 1.89+
5
6boost 1.88 does not have boost system libs anymore
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 CMakeLists.txt | 25 ++++++++++++++-----------
12 1 file changed, 14 insertions(+), 11 deletions(-)
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 73596a6..42f4225 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -80,17 +80,20 @@ endif ()
19
20
21 find_package (Boost 1.38 REQUIRED
22- COMPONENTS filesystem iostreams program_options regex system)
23-
24-include(FetchContent)
25-FetchContent_Declare(
26- fmt
27- GIT_REPOSITORY https://github.com/fmtlib/fmt.git
28- GIT_TAG 10.2.1
29- GIT_PROGRESS TRUE
30- USES_TERMINAL_DOWNLOAD TRUE
31-)
32-FetchContent_MakeAvailable(fmt)
33+ COMPONENTS filesystem iostreams program_options regex)
34+
35+find_package(fmt)
36+if (NOT fmt_FOUND)
37+ include(FetchContent)
38+ FetchContent_Declare(
39+ fmt
40+ GIT_REPOSITORY https://github.com/fmtlib/fmt.git
41+ GIT_TAG 10.2.1
42+ GIT_PROGRESS TRUE
43+ USES_TERMINAL_DOWNLOAD TRUE
44+ )
45+ FetchContent_MakeAvailable(fmt)
46+endif (NOT fmt_FOUND)
47
48 find_package(Snappy)
49 if (SNAPPY_FOUND)
diff --git a/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch b/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch
deleted file mode 100644
index 982e37d5b8..0000000000
--- a/meta-oe/recipes-support/avro/avro-c++/0002-Add-package-configuration-files.patch
+++ /dev/null
@@ -1,90 +0,0 @@
1From 01a29c294c898cf6e13fb500b8514e9982982e1f Mon Sep 17 00:00:00 2001
2From: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
3Date: Mon, 7 Jul 2025 18:16:35 +0300
4Subject: [PATCH] Add package configuration files
5
6Upstream-Status: Pending
7
8Signed-off-by: Rui Costa <rui.ms.costa@ctw.bmwgroup.com>
9Signed-off-by: Alper Ak <alperyasinak1@gmail.com>
10---
11 lang/c++/CMakeLists.txt | 46 ++++++++++++++++++++++++------
12 lang/c++/cmake/AvroCppConfig.cmake | 5 ++++
13 2 files changed, 43 insertions(+), 8 deletions(-)
14 create mode 100644 lang/c++/cmake/AvroCppConfig.cmake
15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 1f5f98c83..73596a6cf 100644
18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt
20@@ -167,18 +167,48 @@ set (CPACK_PACKAGE_FILE_NAME "avrocpp-${AVRO_VERSION_MAJOR}")
21
22 include (CPack)
23
24-install (TARGETS avrocpp avrocpp_s
25- LIBRARY DESTINATION lib
26- ARCHIVE DESTINATION lib
27- RUNTIME DESTINATION lib)
28-
29-install (TARGETS avrogencpp RUNTIME DESTINATION bin)
30-
31-install (DIRECTORY include/avro DESTINATION include
32+install(TARGETS avrocpp
33+ EXPORT AvroCppTargets
34+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
35+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
36+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
37+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
38+
39+install(TARGETS avrogencpp
40+ EXPORT AvroCppTargets
41+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
42+
43+install(DIRECTORY include/avro DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
44 FILES_MATCHING PATTERN *.hh)
45
46+
47 if (NOT CMAKE_BUILD_TYPE)
48 set (CMAKE_BUILD_TYPE Release CACHE STRING
49 "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
50 FORCE)
51 endif (NOT CMAKE_BUILD_TYPE)
52+
53+# Create cmake config files
54+include(CMakePackageConfigHelpers)
55+write_basic_package_version_file(
56+ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake"
57+ VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH}
58+ COMPATIBILITY AnyNewerVersion
59+)
60+
61+configure_file(cmake/AvroCppConfig.cmake
62+ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfig.cmake"
63+ COPYONLY
64+)
65+
66+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/avrocpp)
67+install(EXPORT AvroCppTargets
68+ FILE AvroCppTargets.cmake
69+ NAMESPACE AvroCpp::
70+ DESTINATION ${ConfigPackageLocation}
71+)
72+install(FILES
73+ "cmake/AvroCppConfig.cmake"
74+ "${CMAKE_CURRENT_BINARY_DIR}/AvroCppConfigVersion.cmake"
75+ DESTINATION ${ConfigPackageLocation}
76+ COMPONENT Devel)
77diff --git a/lang/c++/cmake/AvroCppConfig.cmake b/lang/c++/cmake/AvroCppConfig.cmake
78new file mode 100644
79index 000000000..deb8aaa31
80--- /dev/null
81+++ b/cmake/AvroCppConfig.cmake
82@@ -0,0 +1,5 @@
83+include(CMakeFindDependencyMacro)
84+find_dependency(Boost 1.38 REQUIRED
85+ COMPONENTS filesystem iostreams program_options regex system)
86+
87+include("${CMAKE_CURRENT_LIST_DIR}/AvroCppTargets.cmake")
88--
892.43.0
90
diff --git a/meta-oe/recipes-support/avro/avro-c++_1.12.bb b/meta-oe/recipes-support/avro/avro-c++_1.12.1.bb
index a07ddbfe52..729763d133 100644
--- a/meta-oe/recipes-support/avro/avro-c++_1.12.bb
+++ b/meta-oe/recipes-support/avro/avro-c++_1.12.1.bb
@@ -7,15 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=34cb96edab958a981837bf6f44bf654d"
7 7
8DEPENDS = "boost" 8DEPENDS = "boost"
9 9
10SRC_URI = "git://github.com/apache/avro.git;branch=branch-1.12;protocol=https;name=avro-c++ \ 10SRC_URI = "git://github.com/apache/avro.git;branch=branch-1.12;protocol=https;name=avro-c++;tag=release-${PV} \
11 git://github.com/fmtlib/fmt.git;branch=10.x;protocol=https;name=fmt;destsuffix=_deps/fmt-src \ 11 git://github.com/fmtlib/fmt.git;branch=10.x;protocol=https;name=fmt;destsuffix=_deps/fmt-src \
12 file://0001-Remove-cpp-unittest-compilation.patch \ 12 "
13 file://0002-Add-package-configuration-files.patch \ 13
14 file://0001-cmake-Port-to-work-with-boost-1.89.patch \ 14SRCREV_FORMAT = "avro-c++_fmt"
15 " 15SRCREV_avro-c++ = "9110c693767c1dde2665b2b57939333478b12036"
16
17SRCREV_FORMAT = "avro-c++ fmt"
18SRCREV_avro-c++ = "8c27801dc8d42ccc00997f25c0b8f45f8d4a233e"
19# Tag 10.2.1 16# Tag 10.2.1
20SRCREV_fmt = "e69e5f977d458f2650bb346dadf2ad30c5320281" 17SRCREV_fmt = "e69e5f977d458f2650bb346dadf2ad30c5320281"
21 18
@@ -23,6 +20,7 @@ S = "${UNPACKDIR}/${BP}/lang/c++"
23 20
24inherit cmake pkgconfig 21inherit cmake pkgconfig
25 22
23EXTRA_OECMAKE += "-DAVRO_BUILD_TESTS=OFF"
26do_configure:prepend() { 24do_configure:prepend() {
27 install -d ${B}/_deps 25 install -d ${B}/_deps
28 cp -r ${UNPACKDIR}/_deps/fmt-src ${B}/_deps/ 26 cp -r ${UNPACKDIR}/_deps/fmt-src ${B}/_deps/
diff --git a/meta-oe/recipes-support/avro/avro-c_1.12.0.bb b/meta-oe/recipes-support/avro/avro-c_1.12.1.bb
index 3876f5e308..aa3677684a 100644
--- a/meta-oe/recipes-support/avro/avro-c_1.12.0.bb
+++ b/meta-oe/recipes-support/avro/avro-c_1.12.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae"
8DEPENDS = "jansson zlib xz" 8DEPENDS = "jansson zlib xz"
9 9
10BRANCH = "branch-1.12" 10BRANCH = "branch-1.12"
11SRCREV = "8c27801dc8d42ccc00997f25c0b8f45f8d4a233e" 11SRCREV = "9110c693767c1dde2665b2b57939333478b12036"
12SRC_URI = " \ 12SRC_URI = " \
13 git://github.com/apache/avro;branch=${BRANCH};protocol=https;tag=release-${PV} \ 13 git://github.com/apache/avro;branch=${BRANCH};protocol=https;tag=release-${PV} \
14" 14"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-07 14:39:51 +0000