From 0b7c3c4b245a6f19bad923cb744412d632b6ac9f Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Wed, 8 Jun 2022 10:38:58 -0600 Subject: [PATCH] fix: add missing build constraints for sqlite (#11272) --- plugins/inputs/sql/drivers_sqlite.go | 10 ++++++++-- plugins/inputs/sql/drivers_sqlite_other.go | 4 ++-- scripts/check-deps.sh | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/plugins/inputs/sql/drivers_sqlite.go b/plugins/inputs/sql/drivers_sqlite.go index 7c0243026..355b870d5 100644 --- a/plugins/inputs/sql/drivers_sqlite.go +++ b/plugins/inputs/sql/drivers_sqlite.go @@ -1,5 +1,11 @@ -//go:build !arm && !mips && !mipsle && !mips64 && !mips64le -// +build !arm,!mips,!mipsle,!mips64,!mips64le +//go:build !arm && !mips && !mipsle && !mips64 && !mips64le && !ppc64 && !(freebsd && arm64) +// +build !arm +// +build !mips +// +build !mipsle +// +build !mips64 +// +build !mips64le +// +build !ppc64 +// +build !freebsd !arm64 package sql diff --git a/plugins/inputs/sql/drivers_sqlite_other.go b/plugins/inputs/sql/drivers_sqlite_other.go index 28b7946e1..7f927a644 100644 --- a/plugins/inputs/sql/drivers_sqlite_other.go +++ b/plugins/inputs/sql/drivers_sqlite_other.go @@ -1,4 +1,4 @@ -//go:build arm || mips || mipsle || mips64 || mips64le -// +build arm mips mipsle mips64 mips64le +//go:build arm || mips || mipsle || mips64 || mips64le || ppc64 || (freebsd && arm64) +// +build arm mips mipsle mips64 mips64le ppc64 freebsd,arm64 package sql diff --git a/scripts/check-deps.sh b/scripts/check-deps.sh index c52c553f5..f6f67c861 100755 --- a/scripts/check-deps.sh +++ b/scripts/check-deps.sh @@ -19,11 +19,12 @@ for target in ${targets}; do *) continue;; esac + echo "${target%%/*}/${target##*/}" GOOS=${target%%/*} GOARCH=${target##*/} \ go list -deps -f '{{with .Module}}{{.Path}}{{end}}' ./cmd/telegraf/ >> "${tmpdir}/golist" done -for dep in $(LC_ALL=C sort -u "${tmpdir}/golist"); do +LC_ALL=C sort -u < "${tmpdir}/golist" | while IFS= read -r dep; do case "${dep}" in # ignore ourselves github.com/influxdata/telegraf) continue;;