From a775c08d77822732efd28af0681eeb54eafb30eafea49234dcd84c35644811db Mon Sep 17 00:00:00 2001 From: Kirk Allan Date: Wed, 14 Dec 2022 17:44:37 +0000 Subject: [PATCH] Accepting request 1042968 from home:kallan:branches:Virtualization:VMware - Don't use new LDFLAGS, -labsl_synchronization -lgpr, when building for SLE. - Add dependencies on grpc, protobuf, and containerd for container introspection - Added patches (jsc-PED-1344) + detect-suse-location.patch OBS-URL: https://build.opensuse.org/request/show/1042968 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=423 --- open-vm-tools.changes | 11 ++++++++++- open-vm-tools.spec | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/open-vm-tools.changes b/open-vm-tools.changes index bd0fb6e..fde8a95 100644 --- a/open-vm-tools.changes +++ b/open-vm-tools.changes @@ -1,8 +1,17 @@ +------------------------------------------------------------------- +Tue Dec 13 19:54:02 UTC 2022 - Kirk Allan + +- Don't use new LDFLAGS, -labsl_synchronization -lgpr, when building for SLE. + ------------------------------------------------------------------- Mon Dec 12 19:01:53 UTC 2022 - Caleb Crane - Add containerInfo plugin (jsc-PED-1344) - - Add dependencies on grpc, protobuf, and containerd for container introspection + - Add dependencies on grpc, protobuf, and containerd for container + introspection + +- Added patches (jsc-PED-1344) + + detect-suse-location.patch ------------------------------------------------------------------- Thu Dec 8 20:24:29 UTC 2022 - Caleb Crane diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 62af89d..4677af1 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -276,11 +276,15 @@ sed -i -e "s/\r//" README # (this is because of 'g_static_mutex_init' usage which is now deprecated) export CFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-sizeof-pointer-memaccess -Wno-cpp -fPIE" export CXXFLAGS="%{optflags} -Wno-unused-local-typedefs -Wno-unused-but-set-variable -Wno-deprecated-declarations -Wno-sizeof-pointer-memaccess -Wno-cpp -fPIE" -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 +%if 0%{?suse_version} > 1500 export LDFLAGS="-pie -ltirpc -labsl_synchronization -lgpr" %else +%if 0%{?sle_version} >= 150300 +export LDFLAGS="-pie -ltirpc" +%else export LDFLAGS="-pie" %endif +%endif # Required for version 9.4.0 export CUSTOM_PROCPS_NAME=procps autoreconf -fi