From 7d23867a7ea813948a86ac8d76345786e7e6faf2 Mon Sep 17 00:00:00 2001 From: Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> Date: Fri, 6 Dec 2024 21:18:46 +0100 Subject: [PATCH] Fix avro cpp compilation under linux (#42573) --- ports/avro-cpp/fix-std32_t.patch | 12 ++++++++++++ ports/avro-cpp/portfile.cmake | 1 + ports/avro-cpp/vcpkg.json | 1 + versions/a-/avro-cpp.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/avro-cpp/fix-std32_t.patch diff --git a/ports/avro-cpp/fix-std32_t.patch b/ports/avro-cpp/fix-std32_t.patch new file mode 100644 index 0000000000..1f0ff42a2d --- /dev/null +++ b/ports/avro-cpp/fix-std32_t.patch @@ -0,0 +1,12 @@ +diff --git a/lang/c++/include/avro/LogicalType.hh b/lang/c++/include/avro/LogicalType.hh +index b2a7d0294..7b113b3aa 100644 +--- a/lang/c++/include/avro/LogicalType.hh ++++ b/lang/c++/include/avro/LogicalType.hh +@@ -22,6 +22,7 @@ + #include + + #include "Config.hh" ++#include + + namespace avro { + diff --git a/ports/avro-cpp/portfile.cmake b/ports/avro-cpp/portfile.cmake index b6a2d8ea37..d3b3a5dd83 100644 --- a/ports/avro-cpp/portfile.cmake +++ b/ports/avro-cpp/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-cmake.patch fix-fmt.patch + fix-std32_t.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/avro-cpp/vcpkg.json b/ports/avro-cpp/vcpkg.json index 9756896069..ab8cf5e819 100644 --- a/ports/avro-cpp/vcpkg.json +++ b/ports/avro-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "avro-cpp", "version": "1.12.0", + "port-version": 2, "description": "Apache Avro is a data serialization system", "homepage": "https://github.com/apache/avro", "license": "Apache-2.0", diff --git a/versions/a-/avro-cpp.json b/versions/a-/avro-cpp.json index 192ebc8052..a5eab3933f 100644 --- a/versions/a-/avro-cpp.json +++ b/versions/a-/avro-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ef85ccd3feb1c611ad245ab1ead9796b09b1bc9", + "version": "1.12.0", + "port-version": 2 + }, { "git-tree": "d177503c9c4f90f723a50e01156fbb79b479237d", "version": "1.12.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3611599790..e403309127 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -382,7 +382,7 @@ }, "avro-cpp": { "baseline": "1.12.0", - "port-version": 0 + "port-version": 2 }, "awlib": { "baseline": "2024-04-06",