git: 1cc8118103cb - main - sysutils/datadog-agent: Unbreak build on amd64

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dmitri Goutnik <dmgk_at_FreeBSD.org>
Date: Sat, 14 May 2022 13:19:50 UTC
The branch main has been updated by dmgk:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1cc8118103cb4f4b050573d40a9c67adf8049aa2

commit 1cc8118103cb4f4b050573d40a9c67adf8049aa2
Author:     Dmitri Goutnik <dmgk@FreeBSD.org>
AuthorDate: 2022-05-14 13:13:37 +0000
Commit:     Dmitri Goutnik <dmgk@FreeBSD.org>
CommitDate: 2022-05-14 13:13:37 +0000

    sysutils/datadog-agent: Unbreak build on amd64
    
    - Regenerate distinfo:
    
    ===>  Giving up on fetching files:  kubernetes-component-base-039242c015a9_GH0.tar.gz
    Make sure the Makefile and distinfo file (/usr/ports/sysutils/datadog-agent/distinfo)
    are up to date.  If you are absolutely sure you want to override this
    check, type "make NO_CHECKSUM=yes [other args]".
    
    - Adjust CGO_CFLAGS:
    
    vendor/github.com/DataDog/zstd/zstd_stream.go:61:22: could not determine kind of name for C.ZSTD_compressBegin
    vendor/github.com/DataDog/zstd/zstd_stream.go:64:22: could not determine kind of name for C.ZSTD_compressBegin_usingDict
    vendor/github.com/DataDog/zstd/zstd_stream.go:94:13: could not determine kind of name for C.ZSTD_compressContinue
    vendor/github.com/DataDog/zstd/zstd_stream.go:120:13: could not determine kind of name for C.ZSTD_compressEnd
    
    - Mark BROKEN on i386:
    
    vendor/github.com/DataDog/gopsutil/process/process_freebsd.go:95:9: cannot use k.Start.Sec * 1000 (value of type int32) as type int64 in return statement
    vendor/github.com/DataDog/gopsutil/process/process_freebsd.go:383:17: cannot use k.Start.Sec * 1000 (value of type int32) as type int64 in struct literal
    
    PR:             260522
    Approved by:    portmgr (blanket, build fix)
---
 sysutils/datadog-agent/Makefile |  4 +++-
 sysutils/datadog-agent/distinfo | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sysutils/datadog-agent/Makefile b/sysutils/datadog-agent/Makefile
index a7b679b3e7b6..c020d3595414 100644
--- a/sysutils/datadog-agent/Makefile
+++ b/sysutils/datadog-agent/Makefile
@@ -9,6 +9,8 @@ COMMENT=	Datadog Agent: collect metrics and events from your systems and apps
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_i386=	fails to build: vendor/github.com/DataDog/gopsutil/process/process_freebsd.go:95:9: cannot use k.Start.Sec * 1000 (value of type int32) as type int64 in return statement
+
 BUILD_DEPENDS=	cmake>=3.12:devel/cmake \
 		go-bindata>0:devel/go-bindata
 
@@ -318,7 +320,7 @@ NO_CCACHE=		yes
 
 USE_RC_SUBR=	${PORTNAME}
 
-CGO_CFLAGS=	-w -I${WRKSRC}/rtloader/include -I${WRKSRC}/rtloader/common
+CGO_CFLAGS=	-w -I. -I${WRKSRC}/rtloader/include -I${WRKSRC}/rtloader/common
 CGO_LDFLAGS=	-L${WRKSRC}/rtloader/rtloader
 GO_BUILDFLAGS=	-tags '${AGENT_BUILD_TAGS}' \
     -ldflags="-s -X 'github.com/DataDog/${GH_PROJECT}/pkg/version.AgentVersion=${DISTVERSION}' -X 'github.com/DataDog/${GH_PROJECT}/pkg/config.DefaultPython=3'"
diff --git a/sysutils/datadog-agent/distinfo b/sysutils/datadog-agent/distinfo
index 90d3832c96fe..e46c149dbb3b 100644
--- a/sysutils/datadog-agent/distinfo
+++ b/sysutils/datadog-agent/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1610104349
+TIMESTAMP = 1652531585
 SHA256 (datadog-datadog-agent-7.24.1_GH0.tar.gz) = 147e85c48809318ed453a286fd9a2e32a74e6621429590bd1e127a32f68b0552
 SIZE (datadog-datadog-agent-7.24.1_GH0.tar.gz) = 17245055
 SHA256 (DataDog-agent-payload-v4.46.0_GH0.tar.gz) = 57020bf13fc1632c7b0145341d407d0c644c64dd7939f5582685207d6ea15a4c
@@ -23,8 +23,8 @@ SHA256 (DataDog-mmh3-f5b682d8c981_GH0.tar.gz) = aa74514ca1a97fc7cc718c08b10baeca
 SIZE (DataDog-mmh3-f5b682d8c981_GH0.tar.gz) = 16596
 SHA256 (DataDog-viper-v1.8.0_GH0.tar.gz) = 99741e1b749517779d40321057e20a61b27a46cdcb68504844a2b7fafaafa3ef
 SIZE (DataDog-viper-v1.8.0_GH0.tar.gz) = 50566
-SHA256 (DataDog-watermarkpodautoscaler-v0.1.0_GH0.tar.gz) = 73ba57c4b5570b51279fe25d7b649b93bbc1b4bc8f7020f73628126ffb62970d
-SIZE (DataDog-watermarkpodautoscaler-v0.1.0_GH0.tar.gz) = 5567158
+SHA256 (DataDog-watermarkpodautoscaler-v0.1.0_GH0.tar.gz) = 949fd43c76eef376826ab769ce7ff4365c1328dff4c9505f0e7284945d0b6f59
+SIZE (DataDog-watermarkpodautoscaler-v0.1.0_GH0.tar.gz) = 5567155
 SHA256 (DataDog-zstd-2bf71ec48360_GH0.tar.gz) = 88bdc6cb4da26805984d8d8d0f4e3e0fa36d05f159acb23302ca1344b63a912e
 SIZE (DataDog-zstd-2bf71ec48360_GH0.tar.gz) = 99763
 SHA256 (Knetic-govaluate-v3.0.0_GH0.tar.gz) = 3800c76ba83d7e5cff279ca5981d06a2c449b102644aa57861eb5958c8e0ae0c
@@ -111,8 +111,8 @@ SHA256 (coreos-go-systemd-40e2722dffea_GH0.tar.gz) = 6fd00f124d7a6e2ceee3fb87beb
 SIZE (coreos-go-systemd-40e2722dffea_GH0.tar.gz) = 58252
 SHA256 (coreos-pkg-399ea9e2e55f_GH0.tar.gz) = 8477b19c53a35bb011af2d55dba07f2fcfb258eda0c4cdde9ac516d6d5fe62fa
 SIZE (coreos-pkg-399ea9e2e55f_GH0.tar.gz) = 32439
-SHA256 (datadog-extendeddaemonset-94ec1f3a5192_GH0.tar.gz) = 27a0a0fc3aa59e4d56210382d049c90927b9cbc847a9cc6a6f8f004e9c8670ae
-SIZE (datadog-extendeddaemonset-94ec1f3a5192_GH0.tar.gz) = 6022023
+SHA256 (datadog-extendeddaemonset-94ec1f3a5192_GH0.tar.gz) = a6c4e8db366dc440add71ca82490ad5c9508106230eb72e1a524d659385e5772
+SIZE (datadog-extendeddaemonset-94ec1f3a5192_GH0.tar.gz) = 6022021
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (dgraph-io-ristretto-v0.0.3_GH0.tar.gz) = 2e671b6cde9f4aab494afb4c267680bcffdca8224ec8f5703dcae464a560866e
@@ -277,7 +277,7 @@ SHA256 (kardianos-osext-2bc1f35cddc0_GH0.tar.gz) = c032455620be4be434428bfe5b736
 SIZE (kardianos-osext-2bc1f35cddc0_GH0.tar.gz) = 4898
 SHA256 (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 0fe1169bb05476f0a3270866cdd9b39b7986a1dce556f6508046ac5f0c5ad8f3
 SIZE (konsorten-go-windows-terminal-sequences-v1.0.3_GH0.tar.gz) = 1983
-SHA256 (kubernetes-incubator-custom-metrics-apiserver-3d9be26a50eb_GH0.tar.gz) = 2c6158e313b14f2f769fd6c37c9490ddf9abb00c73076da8f9d5bc12025979d5
+SHA256 (kubernetes-incubator-custom-metrics-apiserver-3d9be26a50eb_GH0.tar.gz) = 542244e3c2c3bb0d73e6614ef58bdf1462c5d9fb0b8f751b0829b4244ae0da89
 SIZE (kubernetes-incubator-custom-metrics-apiserver-3d9be26a50eb_GH0.tar.gz) = 21803302
 SHA256 (kubernetes-sigs-controller-runtime-v0.5.2_GH0.tar.gz) = da772a6aa77b46916e34716d34f7825d0a63c8d881404b72d0a621a381cd4e10
 SIZE (kubernetes-sigs-controller-runtime-v0.5.2_GH0.tar.gz) = 265957
@@ -299,7 +299,7 @@ SHA256 (kubernetes-client-go-bec269661e48_GH0.tar.gz) = ab3f4cfe6e06e587a24984e4
 SIZE (kubernetes-client-go-bec269661e48_GH0.tar.gz) = 586268
 SHA256 (kubernetes-cloud-provider-20453efc2458_GH0.tar.gz) = edf66cafced197c9f9a9724cf3d510d166383c32e96725d540b0f7515d5a15f6
 SIZE (kubernetes-cloud-provider-20453efc2458_GH0.tar.gz) = 38489
-SHA256 (kubernetes-component-base-039242c015a9_GH0.tar.gz) = 7667471877a6a4436d7b9203bbe94eda5448a367aaf615ecbf542886b6a00aa7
+SHA256 (kubernetes-component-base-039242c015a9_GH0.tar.gz) = 2b5f32f0fb12f13317174fb4bf795a36495e4aa3a3045ef0a86d8784cc68115e
 SIZE (kubernetes-component-base-039242c015a9_GH0.tar.gz) = 55196
 SHA256 (kubernetes-cri-api-608eb1dad4ac_GH0.tar.gz) = 8c6479a48f18710699c043725e9292ddb4e1fbc730df6557e589632c1f27ff64
 SIZE (kubernetes-cri-api-608eb1dad4ac_GH0.tar.gz) = 91129