diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2024-06-07 03:58:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 10:58:24 +0300 |
| commit | 5b8142526c2449c1120c418a1905734ff2275310 (patch) | |
| tree | c2136ed6d8f83baa2a1894e066b2d9c66aa1a614 | |
| parent | 496f8621583e42ef523355b46606e7fb65d23e54 (diff) | |
Use bundled protobuf for openSUSE packages. (#17827)
* Use bundled protobuf for openSUSE packages.
Since their system copy seems to have major issues.
* Force vendored Abseil to be a static build.
Without this, we end up with linking issues if there’s an existing copy
of Abseil on the system.
| -rw-r--r-- | netdata.spec.in | 4 | ||||
| -rw-r--r-- | packaging/cmake/Modules/NetdataProtobuf.cmake | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/netdata.spec.in b/netdata.spec.in index 5702aa0315..04277988ac 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -360,8 +360,12 @@ happened, on your systems and applications. -DENABLE_BUNDLED_PROTOBUF=Off \ %endif %else + %if 0%{?suse_version:1} + -DENABLE_BUNDLED_PROTOBUF=On \ + %else -DENABLE_BUNDLED_PROTOBUF=Off \ %endif + %endif %if %{_have_ml} -DENABLE_ML=On \ %else diff --git a/packaging/cmake/Modules/NetdataProtobuf.cmake b/packaging/cmake/Modules/NetdataProtobuf.cmake index 44f9afc191..e6859e9ddb 100644 --- a/packaging/cmake/Modules/NetdataProtobuf.cmake +++ b/packaging/cmake/Modules/NetdataProtobuf.cmake @@ -28,6 +28,7 @@ function(netdata_bundle_protobuf) if(NEED_ABSL) set(ABSL_PROPAGATE_CXX_STD On) set(ABSL_ENABLE_INSTALL Off) + set(BUILD_SHARED_LIBS Off) message(STATUS "Preparing bundled Abseil (required by bundled Protobuf)") FetchContent_Declare(absl |