diff options
-rw-r--r-- | meta-oe/recipes-support/avro/avro-c++/0001-cmake-Port-to-work-with-boost-1.89.patch | 49 | ||||
-rw-r--r-- | meta-oe/recipes-support/avro/avro-c++_1.12.bb | 4 |
2 files changed, 52 insertions, 1 deletions
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 new file mode 100644 index 0000000000..0411f2fded --- /dev/null +++ b/meta-oe/recipes-support/avro/avro-c++/0001-cmake-Port-to-work-with-boost-1.89.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From f7c76ff3d693e6df5693fcd2864101b9913b1a44 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 30 Aug 2025 18:16:10 -0700 | ||
4 | Subject: [PATCH] cmake: Port to work with boost 1.89+ | ||
5 | |||
6 | boost 1.88 does not have boost system libs anymore | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 25 ++++++++++++++----------- | ||
12 | 1 file changed, 14 insertions(+), 11 deletions(-) | ||
13 | |||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
15 | index 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++_1.12.bb b/meta-oe/recipes-support/avro/avro-c++_1.12.bb index 61aef88e13..a07ddbfe52 100644 --- a/meta-oe/recipes-support/avro/avro-c++_1.12.bb +++ b/meta-oe/recipes-support/avro/avro-c++_1.12.bb | |||
@@ -10,7 +10,9 @@ DEPENDS = "boost" | |||
10 | SRC_URI = "git://github.com/apache/avro.git;branch=branch-1.12;protocol=https;name=avro-c++ \ | 10 | SRC_URI = "git://github.com/apache/avro.git;branch=branch-1.12;protocol=https;name=avro-c++ \ |
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 | file://0001-Remove-cpp-unittest-compilation.patch \ |
13 | file://0002-Add-package-configuration-files.patch" | 13 | file://0002-Add-package-configuration-files.patch \ |
14 | file://0001-cmake-Port-to-work-with-boost-1.89.patch \ | ||
15 | " | ||
14 | 16 | ||
15 | SRCREV_FORMAT = "avro-c++ fmt" | 17 | SRCREV_FORMAT = "avro-c++ fmt" |
16 | SRCREV_avro-c++ = "8c27801dc8d42ccc00997f25c0b8f45f8d4a233e" | 18 | SRCREV_avro-c++ = "8c27801dc8d42ccc00997f25c0b8f45f8d4a233e" |