c_cpp/lightstep-tracer-cpp
SHA256
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/lightstep-tracer-cpp?expand=0&rev=7

Browse Source
This commit is contained in:
Dirk Mueller
2023-03-22 12:25:16 +00:00
committed by Git OBS Bridge
parent 83d6a9ce3f
commit 672197f941
4 changed files with 186 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
0001-bazel-Update-googleapis.patch Normal file
View File

@@ -0,0 +1,135 @@
From 2a42ea794ff59e121c8c7de896cbc63625891ee1 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <mrostecki@opensuse.org>
Date: Tue, 5 Nov 2019 11:11:57 +0100
Subject: [PATCH] bazel: Update googleapis
Update googleapis to the same version as Envoy is using.
Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
---
WORKSPACE | 63 +++++++++++++++++-----
lightstep-tracer-common/BUILD | 2 +-
.../third_party/googleapis/BUILD | 11 ----
.../third_party/googleapis/WORKSPACE | 0
4 files changed, 52 insertions(+), 24 deletions(-)
delete mode 100644 lightstep-tracer-common/third_party/googleapis/BUILD
delete mode 100644 lightstep-tracer-common/third_party/googleapis/WORKSPACE
diff --git a/WORKSPACE b/WORKSPACE
index 7f9156f..9f6c9f1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,26 +1,65 @@
workspace(name = "com_lightstep_tracer_cpp")
-git_repository(
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
name = "io_opentracing_cpp",
- remote = "https://github.com/opentracing/opentracing-cpp",
- commit = "ac50154a7713877f877981c33c3375003b6ebfe1",
+ sha256 = "6f4d449e6b411708140d8844aa135f97a8d055bcf4e27334ffa2c1394686451f",
+ strip_prefix = "opentracing-cpp-ac50154a7713877f877981c33c3375003b6ebfe1",
+ urls = ["https://github.com/opentracing/opentracing-cpp/archive/ac50154a7713877f877981c33c3375003b6ebfe1.tar.gz"],
)
http_archive(
name = "com_google_protobuf",
- sha256 = "5d4551193416861cb81c3bc0a428f22a6878148c57c31fb6f8f2aa4cf27ff635",
- strip_prefix = "protobuf-c4f59dcc5c13debc572154c8f636b8a9361aacde",
- urls = ["https://github.com/google/protobuf/archive/c4f59dcc5c13debc572154c8f636b8a9361aacde.tar.gz"],
+ sha256 = "6adf73fd7f90409e479d6ac86529ade2d45f50494c5c10f539226693cb8fe4f7",
+ strip_prefix = "protobuf-3.10.1",
+ urls = ["https://github.com/google/protobuf/archive/v3.10.1.tar.gz"],
)
http_archive(
name = "com_google_protobuf_cc",
- sha256 = "5d4551193416861cb81c3bc0a428f22a6878148c57c31fb6f8f2aa4cf27ff635",
- strip_prefix = "protobuf-c4f59dcc5c13debc572154c8f636b8a9361aacde",
- urls = ["https://github.com/google/protobuf/archive/c4f59dcc5c13debc572154c8f636b8a9361aacde.tar.gz"],
+ sha256 = "6adf73fd7f90409e479d6ac86529ade2d45f50494c5c10f539226693cb8fe4f7",
+ strip_prefix = "protobuf-3.10.1",
+ urls = ["https://github.com/google/protobuf/archive/v3.10.1.tar.gz"],
)
-local_repository(
- name = "lightstep_vendored_googleapis",
- path = "lightstep-tracer-common/third_party/googleapis",
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
+http_archive(
+ name = "com_github_grpc_grpc",
+ sha256 = "f56ced18740895b943418fa29575a65cc2396ccfa3159fa40d318ef5f59471f9",
+ strip_prefix = "grpc-1.23.0",
+ urls = ["https://github.com/grpc/grpc/archive/v1.23.0.tar.gz"],
+)
+
+load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+
+grpc_deps()
+
+http_archive(
+ name = "io_bazel_rules_go",
+ urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz"],
+ sha256 = "a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329",
+)
+
+load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
+go_rules_dependencies()
+go_register_toolchains()
+
+http_archive(
+ name = "com_google_googleapis",
+ sha256 = "c1969e5b72eab6d9b6cfcff748e45ba57294aeea1d96fd04cd081995de0605c2",
+ strip_prefix = "googleapis-be480e391cc88a75cf2a81960ef79c80d5012068",
+ urls = ["https://github.com/google/googleapis/archive/be480e391cc88a75cf2a81960ef79c80d5012068.tar.gz"],
+)
+
+load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
+
+switched_rules_by_language(
+ name = "com_google_googleapis_imports",
+ cc = True,
+ go = True,
+ grpc = True,
)
diff --git a/lightstep-tracer-common/BUILD b/lightstep-tracer-common/BUILD
index 03418c5..a374cd2 100644
--- a/lightstep-tracer-common/BUILD
+++ b/lightstep-tracer-common/BUILD
@@ -2,7 +2,7 @@ proto_library(
name = "collector_proto",
srcs = ["collector.proto"],
deps = [
- "@lightstep_vendored_googleapis//:googleapis_proto",
+ "@com_google_googleapis//google/api:annotations_proto",
"@com_google_protobuf//:timestamp_proto",
],
visibility = ["//visibility:public"],
diff --git a/lightstep-tracer-common/third_party/googleapis/BUILD b/lightstep-tracer-common/third_party/googleapis/BUILD
deleted file mode 100644
index 2adec34..0000000
--- a/lightstep-tracer-common/third_party/googleapis/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-proto_library(
- name = "googleapis_proto",
- srcs = [
- "google/api/annotations.proto",
- "google/api/http.proto",
- ],
- deps = [
- "@com_google_protobuf//:descriptor_proto",
- ],
- visibility = ["//visibility:public"],
-)
diff --git a/lightstep-tracer-common/third_party/googleapis/WORKSPACE b/lightstep-tracer-common/third_party/googleapis/WORKSPACE
deleted file mode 100644
index e69de29..0000000
--
2.16.4

6
lightstep-tracer-cpp-rpmlintrc Normal file
View File

@@ -0,0 +1,6 @@
# This is a source package and /usr/src is a correct path to install files.
addFilter("lightstep-tracer-cpp-source.* suse-filelist-forbidden-fhs23")
# This is a source package, it's fine to have empty files.
addFilter("lightstep-tracer-cpp-source.* zero-length")
# This is a source package, it's fine to have hidden files.
addFilter("lightstep-tracer-cpp-source.* hidden-file-or-dir")

19
lightstep-tracer-cpp.changes
View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Tue Nov 5 10:19:18 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>
- Add patch which makes lightstep-tracer-cpp compatible with
newer googleapis:
* 0001-bazel-Update-googleapis.patch
-------------------------------------------------------------------
Tue Nov 5 01:24:10 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>
- Change googleapis' name from lightstep_vendored_googleapis to
com_google_googleapis.
-------------------------------------------------------------------
Mon Mar 18 12:05:04 UTC 2019 - Michal Rostecki <mrostecki@opensuse.org>
- Add source package, which is needed to fix envoy-proxy.
(boo#1129568)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 11 16:47:04 UTC 2018 - Michał Rostecki <mrostecki@suse.de> Tue Dec 11 16:47:04 UTC 2018 - Michał Rostecki <mrostecki@suse.de>

34
lightstep-tracer-cpp.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package lightstep-tracer-cpp # spec file for package lightstep-tracer-cpp
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -12,12 +12,13 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%define sover 0 %define sover 0
%define libname liblightstep_tracer%{sover} %define libname liblightstep_tracer%{sover}
%define src_install_dir /usr/src/%{name}
Name: lightstep-tracer-cpp Name: lightstep-tracer-cpp
Version: 0.8.1 Version: 0.8.1
@@ -26,10 +27,13 @@ Summary: C++ library for LightStep distributed tracing
License: MIT License: MIT
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
Url: http://lightstep.com/ Url: http://lightstep.com/
Source: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source100: %{name}-rpmlintrc
Patch0: lightstep-tracer-cpp-cmake-add-soversion.patch Patch0: lightstep-tracer-cpp-cmake-add-soversion.patch
Patch1: lightstep-tracer-cpp-cmake-use-gnuinstalldirs.patch Patch1: lightstep-tracer-cpp-cmake-use-gnuinstalldirs.patch
Patch2: 0001-bazel-Update-googleapis.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: grpc-devel BuildRequires: grpc-devel
BuildRequires: opentracing-cpp-devel BuildRequires: opentracing-cpp-devel
@@ -55,17 +59,29 @@ Requires: %{libname} = %{version}
Development files for lightstep-tracer-cpp - C++ library for LightStep Development files for lightstep-tracer-cpp - C++ library for LightStep
distributed tracing. distributed tracing.
%package source
Summary: Source code of the LightStep C++ library
Group: Development/Sources
BuildArch: noarch
%description source
Development files for lightstep-tracer-cpp - C++ library for LightStep
distributed tracing.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1
%patch1 -p1
%build %build
%cmake %cmake
%make_jobs %cmake_build
%install %install
%cmake_install %cmake_install
# Install sources
rm -rf build
mkdir -p %{buildroot}%{src_install_dir}
cp -r * %{buildroot}%{src_install_dir}
%fdupes %{src_install_dir}
%post -n %{libname} -p /sbin/ldconfig %post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig
@@ -79,5 +95,7 @@ distributed tracing.
%{_includedir}/lightstep %{_includedir}/lightstep
%{_libdir}/liblightstep_tracer.so %{_libdir}/liblightstep_tracer.so
%changelog %files source
%{src_install_dir}
%changelog