diff options
author | Sören Tempel <soeren+git@soeren-tempel.net> | 2024-03-12 15:17:13 +0100 |
---|---|---|
committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2024-03-12 15:17:13 +0100 |
commit | 64601b1bfb2592c7b81e498ca979fb8f17571ec2 (patch) | |
tree | 258e6bbc756c478a2e8462ec4956770cc3be71b9 | |
parent | a92091c6f45d2ae0b773e3fa1e2d7f5d8cb3e682 (diff) | |
download | aports-64601b1bfb2592c7b81e498ca979fb8f17571ec2.zip |
testing/*: enable cgo
See #15809
-rw-r--r-- | testing/autoscan/APKBUILD | 1 | ||||
-rw-r--r-- | testing/butane/APKBUILD | 1 | ||||
-rw-r--r-- | testing/dapr-cli/APKBUILD | 2 | ||||
-rw-r--r-- | testing/elastic-beats/APKBUILD | 2 | ||||
-rw-r--r-- | testing/envconsul/APKBUILD | 1 | ||||
-rw-r--r-- | testing/etcd/APKBUILD | 1 | ||||
-rw-r--r-- | testing/flux/APKBUILD | 5 | ||||
-rw-r--r-- | testing/hilbish/APKBUILD | 1 | ||||
-rw-r--r-- | testing/hubble-cli/APKBUILD | 1 | ||||
-rw-r--r-- | testing/jackal/APKBUILD | 2 | ||||
-rw-r--r-- | testing/jsonnet-bundler/APKBUILD | 1 | ||||
-rw-r--r-- | testing/kubectl-oidc_login/APKBUILD | 1 | ||||
-rw-r--r-- | testing/linuxkit/APKBUILD | 1 | ||||
-rw-r--r-- | testing/lyrebird/APKBUILD | 1 | ||||
-rw-r--r-- | testing/mailsec-check/APKBUILD | 1 | ||||
-rw-r--r-- | testing/prometheus-smokeping-prober/APKBUILD | 1 | ||||
-rw-r--r-- | testing/protoconf/APKBUILD | 1 | ||||
-rw-r--r-- | testing/regal/APKBUILD | 5 | ||||
-rw-r--r-- | testing/tangctl/APKBUILD | 1 | ||||
-rw-r--r-- | testing/tanka/APKBUILD | 1 | ||||
-rw-r--r-- | testing/tmpl/APKBUILD | 1 | ||||
-rw-r--r-- | testing/trivy/APKBUILD | 2 | ||||
-rw-r--r-- | testing/wgcf/APKBUILD | 1 | ||||
-rw-r--r-- | testing/xcaddy/APKBUILD | 1 | ||||
-rw-r--r-- | testing/ytt/APKBUILD | 1 | ||||
-rw-r--r-- | testing/zot/APKBUILD | 1 |
26 files changed, 0 insertions, 38 deletions
diff --git a/testing/autoscan/APKBUILD b/testing/autoscan/APKBUILD index f0ceda58739..5f41ffc5b60 100644 --- a/testing/autoscan/APKBUILD +++ b/testing/autoscan/APKBUILD @@ -17,7 +17,6 @@ source=" autoscan.confd " -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/butane/APKBUILD b/testing/butane/APKBUILD index 61d986cbe03..6f01d0ea6d8 100644 --- a/testing/butane/APKBUILD +++ b/testing/butane/APKBUILD @@ -10,7 +10,6 @@ makedepends="go" source="$pkgname-$pkgver.tar.gz::https://github.com/coreos/butane/archive/refs/tags/v$pkgver.tar.gz" build() { - CGO_ENABLED=0 \ go build -o butane \ -ldflags "-X github.com/coreos/butane/internal/version.Raw=v$pkgver"\ internal/main.go diff --git a/testing/dapr-cli/APKBUILD b/testing/dapr-cli/APKBUILD index 9fe7ce19b1e..b7c5e854da8 100644 --- a/testing/dapr-cli/APKBUILD +++ b/testing/dapr-cli/APKBUILD @@ -19,8 +19,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/dapr/cli/archive/refs/tags/v builddir="$srcdir/cli-$pkgver" build() { - export CGO_ENABLED=0 - local _goldflags=" -X main.version=$pkgver -X main.apiVersion=$_runtimever diff --git a/testing/elastic-beats/APKBUILD b/testing/elastic-beats/APKBUILD index 21fa1ac2595..edbf4a841f8 100644 --- a/testing/elastic-beats/APKBUILD +++ b/testing/elastic-beats/APKBUILD @@ -52,8 +52,6 @@ prepare() { } build() { - export CGO_ENABLED=0 - mkdir -p bin # just these two for now diff --git a/testing/envconsul/APKBUILD b/testing/envconsul/APKBUILD index a736e8c967e..a1601daed87 100644 --- a/testing/envconsul/APKBUILD +++ b/testing/envconsul/APKBUILD @@ -16,7 +16,6 @@ export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { - export CGO_ENABLED="0" mkdir -p pkg/linux-$CARCH go build -v -o pkg/linux-$CARCH/$pkgname } diff --git a/testing/etcd/APKBUILD b/testing/etcd/APKBUILD index 8a75f6b3918..7bed51d02d7 100644 --- a/testing/etcd/APKBUILD +++ b/testing/etcd/APKBUILD @@ -21,7 +21,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/coreos/etcd/archive/v$pkgver $pkgname.initd " -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/flux/APKBUILD b/testing/flux/APKBUILD index 58a2a55ff69..6181e0253f8 100644 --- a/testing/flux/APKBUILD +++ b/testing/flux/APKBUILD @@ -18,11 +18,6 @@ builddir="$srcdir/flux2-$pkgver" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" -case "$CARCH" in -aarch64|ppc64le|x86_64) - export CGO_ENABLED=0 - ;; -esac # secfixes: # 0.36.0-r0: diff --git a/testing/hilbish/APKBUILD b/testing/hilbish/APKBUILD index 11f753195e2..821bb5d5a13 100644 --- a/testing/hilbish/APKBUILD +++ b/testing/hilbish/APKBUILD @@ -20,7 +20,6 @@ source=" " builddir="$srcdir/Hilbish-$pkgver" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/hubble-cli/APKBUILD b/testing/hubble-cli/APKBUILD index 032ff1b5631..9e55e4e229c 100644 --- a/testing/hubble-cli/APKBUILD +++ b/testing/hubble-cli/APKBUILD @@ -17,7 +17,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/cilium/hubble/archive/refs/t " builddir="$srcdir/hubble-$pkgver" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/jackal/APKBUILD b/testing/jackal/APKBUILD index e1c28b041ef..92249226b69 100644 --- a/testing/jackal/APKBUILD +++ b/testing/jackal/APKBUILD @@ -34,8 +34,6 @@ prepare() { } build() { - export CGO_ENABLED=0 - go build ./cmd/jackal go build ./cmd/jackalctl } diff --git a/testing/jsonnet-bundler/APKBUILD b/testing/jsonnet-bundler/APKBUILD index d5808d5bf8d..c34c6bdee5f 100644 --- a/testing/jsonnet-bundler/APKBUILD +++ b/testing/jsonnet-bundler/APKBUILD @@ -9,7 +9,6 @@ license="Apache-2.0" makedepends="go" source="$pkgname-$pkgver.tar.gz::https://github.com/jsonnet-bundler/jsonnet-bundler/archive/refs/tags/v$pkgver.tar.gz" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/kubectl-oidc_login/APKBUILD b/testing/kubectl-oidc_login/APKBUILD index 12e10d82a6e..d2f65eba2a8 100644 --- a/testing/kubectl-oidc_login/APKBUILD +++ b/testing/kubectl-oidc_login/APKBUILD @@ -11,7 +11,6 @@ makedepends="go" source="$pkgname-$pkgver.tar.gz::https://github.com/int128/kubelogin/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/kubelogin-$pkgver" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/linuxkit/APKBUILD b/testing/linuxkit/APKBUILD index f6f493fb524..6d48affa84d 100644 --- a/testing/linuxkit/APKBUILD +++ b/testing/linuxkit/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/linuxkit/linuxkit/archive/refs/tags/v$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver/src/cmd/linuxkit" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/lyrebird/APKBUILD b/testing/lyrebird/APKBUILD index aa4bd6e5ae9..294e334261e 100644 --- a/testing/lyrebird/APKBUILD +++ b/testing/lyrebird/APKBUILD @@ -14,7 +14,6 @@ builddir="$srcdir/lyrebird-lyrebird-$pkgver" # it used to be named this upstream provides="obfs4proxy=$pkgver-r$pkgrel" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/mailsec-check/APKBUILD b/testing/mailsec-check/APKBUILD index 4206a63e9ef..fae6fac63c3 100644 --- a/testing/mailsec-check/APKBUILD +++ b/testing/mailsec-check/APKBUILD @@ -15,7 +15,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/foxcpp/mailsec-check/archive builddir="$srcdir/$pkgname-$_commit" export GOFLAGS="$GOFLAGS -trimpath -mod=readonly -modcacherw" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/prometheus-smokeping-prober/APKBUILD b/testing/prometheus-smokeping-prober/APKBUILD index e3e9f2138ae..cf278c65805 100644 --- a/testing/prometheus-smokeping-prober/APKBUILD +++ b/testing/prometheus-smokeping-prober/APKBUILD @@ -20,7 +20,6 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/SuperQ/smokeping_prober/arc " builddir="$srcdir/$_pkgname-$pkgver" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/protoconf/APKBUILD b/testing/protoconf/APKBUILD index dc59fe7fd30..9bcf849d4b0 100644 --- a/testing/protoconf/APKBUILD +++ b/testing/protoconf/APKBUILD @@ -9,7 +9,6 @@ license="MIT" makedepends="go" source="$pkgname-$pkgver.tar.gz::https://github.com/protoconf/protoconf/archive/refs/tags/v$pkgver.tar.gz" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/regal/APKBUILD b/testing/regal/APKBUILD index a4edf3e7bed..18ef837f9fb 100644 --- a/testing/regal/APKBUILD +++ b/testing/regal/APKBUILD @@ -18,11 +18,6 @@ options="net" # download Go modules export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" -case "$CARCH" in -aarch64|ppc64le|s390х|x86_64) - export CGO_ENABLED=0 - ;; -esac build() { local _goldflags=" diff --git a/testing/tangctl/APKBUILD b/testing/tangctl/APKBUILD index b0262e342b4..97a0c69f45d 100644 --- a/testing/tangctl/APKBUILD +++ b/testing/tangctl/APKBUILD @@ -25,7 +25,6 @@ esac export GOFLAGS="$GOFLAGS -trimpath -mod=readonly -modcacherw" export GOPATH="$srcdir" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/tanka/APKBUILD b/testing/tanka/APKBUILD index ac638325fb8..24846c848a0 100644 --- a/testing/tanka/APKBUILD +++ b/testing/tanka/APKBUILD @@ -11,7 +11,6 @@ depends="kubectl" makedepends="go" source="$pkgname-$pkgver.tar.gz::https://github.com/grafana/tanka/archive/refs/tags/v$pkgver.tar.gz" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/tmpl/APKBUILD b/testing/tmpl/APKBUILD index 2ea360e0975..103c70609f0 100644 --- a/testing/tmpl/APKBUILD +++ b/testing/tmpl/APKBUILD @@ -12,7 +12,6 @@ options="!check" # no tests provided source="$pkgname-$pkgver.tar.gz::https://github.com/krakozaure/tmpl/archive/refs/tags/v$pkgver.tar.gz" -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/trivy/APKBUILD b/testing/trivy/APKBUILD index 9e8eb093426..4a569603765 100644 --- a/testing/trivy/APKBUILD +++ b/testing/trivy/APKBUILD @@ -18,8 +18,6 @@ export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { - export CGO_ENABLED=0 - go build -o trivy -ldflags "-X main.version=$pkgver" cmd/trivy/main.go } diff --git a/testing/wgcf/APKBUILD b/testing/wgcf/APKBUILD index 9ca50a13437..69056ab4951 100644 --- a/testing/wgcf/APKBUILD +++ b/testing/wgcf/APKBUILD @@ -15,7 +15,6 @@ subpackages=" source="$pkgname-$pkgver.tar.gz::https://github.com/ViRb3/wgcf/archive/refs/tags/v$pkgver.tar.gz" options="net" # download Go modules -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" diff --git a/testing/xcaddy/APKBUILD b/testing/xcaddy/APKBUILD index a425e28c67b..683f25867a7 100644 --- a/testing/xcaddy/APKBUILD +++ b/testing/xcaddy/APKBUILD @@ -11,7 +11,6 @@ depends="go" source="https://github.com/caddyserver/xcaddy/archive/v$pkgver/caddy-$pkgver.tar.gz" options="net" # for downloading Go modules -export CGO_ENABLED=0 export GOFLAGS="$GOFLAGS -modcacherw" export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" diff --git a/testing/ytt/APKBUILD b/testing/ytt/APKBUILD index 93928505b46..023680ad059 100644 --- a/testing/ytt/APKBUILD +++ b/testing/ytt/APKBUILD @@ -19,7 +19,6 @@ export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" build() { local ldflags="-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=$pkgver" export GOPATH="$srcdir" - export CGO_ENABLED=0 rm -f website/generated.go go fmt ./cmd/... ./pkg/... diff --git a/testing/zot/APKBUILD b/testing/zot/APKBUILD index e026e16f3b6..808819e8303 100644 --- a/testing/zot/APKBUILD +++ b/testing/zot/APKBUILD @@ -26,7 +26,6 @@ source=" " options="net" # download Go modules -export CGO_ENABLED=0 export GOCACHE="${GOCACHE:-"$srcdir/go-cache"}" export GOTMPDIR="${GOTMPDIR:-"$srcdir"}" export GOMODCACHE="${GOMODCACHE:-"$srcdir/go"}" |