diff --git a/testing/opentelemetry-cpp/APKBUILD b/testing/opentelemetry-cpp/APKBUILD index f528989052f59e853326d159199707320a2f03fc..6928452861313ab782ef4eb475cc432d8b734914 100644 --- a/testing/opentelemetry-cpp/APKBUILD +++ b/testing/opentelemetry-cpp/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Severin Neumann <neumanns@cisco.com> # Maintainer: Severin Neumann <neumanns@cisco.com> pkgname=opentelemetry-cpp -pkgver=1.11.0 -pkgrel=6 -_opentelemetryproto_ver=1.0.0 +pkgver=1.19.0 +pkgrel=0 +_opentelemetryproto_ver=1.5.0 pkgdesc="OpenTelemetry C++" url="https://opentelemetry.io/" arch="all !s390x" # failing test (TraceIdRatioBasedSampler.ShouldSampleWithoutContext) @@ -40,14 +40,9 @@ subpackages=" source=" https://github.com/open-telemetry/opentelemetry-cpp/archive/v$pkgver/opentelemetry-cpp-v$pkgver.tar.gz opentelemetry-proto-$_opentelemetryproto_ver.tar.gz::https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v$_opentelemetryproto_ver.tar.gz - gcc13.patch - gcc14.patch - add-loongarch64-support.patch " build() { - # skip some broken asm in benchmark 1.8.1 - export CXXFLAGS="$CXXFLAGS -DBENCHMARK_HAS_NO_INLINE_ASSEMBLY" cmake -B build -G Ninja -Wno-dev \ -DOTELCPP_PROTO_PATH="$srcdir/opentelemetry-proto-$_opentelemetryproto_ver" \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -71,8 +66,7 @@ build() { check() { cd build - # these seem to fail on 32-bit as passing an invalid curl option - CTEST_OUTPUT_ON_FAILURE=TRUE ctest -j1 -E '(SendPostRequest.*|trace.FastRandomNumberGeneratorTest.GenerateUniqueNumbers)' + CTEST_OUTPUT_ON_FAILURE=TRUE ctest -j1 -E '(trace.FastRandomNumberGeneratorTest.GenerateUniqueNumbers)' } package() { @@ -104,9 +98,6 @@ zipkin() { } sha512sums=" -906df3cd44d88f7846231bc14c7305b9c6d9ee22ebd5a0cce21d6da1d7d62e72efe6101a2518d969a238eb3d6bbdf75e8017d7ab42edc0409391700973602006 opentelemetry-cpp-v1.11.0.tar.gz -74de78304a91fe72cfcdbd87fcb19c0d6338c161d6624ce09eac0527b1b43b8a5d8790ae055e1d3d44319eaa070a506f47e740f888c91d724a0aef8b509688f0 opentelemetry-proto-1.0.0.tar.gz -ca839f8bac0b16855fdbe539c21bf16de0fcd13802bb0ba62d25db99a6bf1fa5e6911dbb19ee0523f39bb47188e5c657e2fd10193908c060a6b74f8d2c5f0fc3 gcc13.patch -c628c8268b987d392e7cc596ef4d7cf2cda9d2d61e44d2515c5e888451fe7b756cc53077c85e5c0b94b377bd74fdf56f942e60c637bd463e47f5e7179a97ad2b gcc14.patch -af3c7063773cf64d305f4d8a1c95ccfd2a45b48014b8f5509642a8efc1a58b16adab00c5e6a4662c83252574b9b5fadf07d07f6ec9c70cf5fab22083da85a6cf add-loongarch64-support.patch +639ca462dc2f3633f6b9c7b89000276d08ddbe1ee9d4322ac6568ad07d198000cf3c7c5d940e10db8142494b984f1f969956524cc2df4a65d072f4c10f367ddb opentelemetry-cpp-v1.19.0.tar.gz +8a3f95543c6093300f0c54f31bf050137d0c6f1d867a7cda7af066b83572643e636b33a9b53e297f8c309bc262dde63cf7c10f515e0fe0cbbce1d12fafbe2482 opentelemetry-proto-1.5.0.tar.gz " diff --git a/testing/opentelemetry-cpp/add-loongarch64-support.patch b/testing/opentelemetry-cpp/add-loongarch64-support.patch deleted file mode 100644 index 6e35602ba730619830d7665dfc6f29cf09695b00..0000000000000000000000000000000000000000 --- a/testing/opentelemetry-cpp/add-loongarch64-support.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcf1034..719e6b0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -72,6 +72,8 @@ else() - set(ARCH s390x) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(sparc.*|SPARC.*)") - set(ARCH sparc) -+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(loongarch64.*|LOONGARCH64.*)") -+ set(ARCH loongarch64) - else() - message( - FATAL_ERROR diff --git a/testing/opentelemetry-cpp/gcc13.patch b/testing/opentelemetry-cpp/gcc13.patch deleted file mode 100644 index 5933a699dfc1198e092697644fb422bad510c799..0000000000000000000000000000000000000000 --- a/testing/opentelemetry-cpp/gcc13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/api/include/opentelemetry/trace/propagation/detail/hex.h b/api/include/opentelemetry/trace/propagation/detail/hex.h -index c8bd58f..aecdedd 100644 ---- a/api/include/opentelemetry/trace/propagation/detail/hex.h -+++ b/api/include/opentelemetry/trace/propagation/detail/hex.h -@@ -5,6 +5,7 @@ - - #include <algorithm> - #include <cstring> -+#include <cstdint> - - #include "opentelemetry/nostd/string_view.h" - #include "opentelemetry/version.h" diff --git a/testing/opentelemetry-cpp/gcc14.patch b/testing/opentelemetry-cpp/gcc14.patch deleted file mode 100644 index ca6041f7a0d31d1ea8212c2602c46b2c229aa05e..0000000000000000000000000000000000000000 --- a/testing/opentelemetry-cpp/gcc14.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/api/test/context/runtime_context_test.cc -+++ b/api/test/context/runtime_context_test.cc -@@ -5,6 +5,7 @@ - #include "opentelemetry/context/context.h" - - #include <gtest/gtest.h> -+#include <algorithm> - - using namespace opentelemetry; -