testing/oauth2-proxy: enable cgo to fix rv64

For riscv64, go does not support internal linking with `-buildmode=pie`.
Before go1.22, it was silently accepted, but since go1.22, it's failing
to build.

Unless there is a good reason, we prefer to build with CGO, so remove
the hardcoded flag in the Makefile.
This commit is contained in:
Kevin Daudt 2024-03-02 07:36:24 +00:00
parent 528339b996
commit 7496de4a3d
2 changed files with 20 additions and 1 deletions

View File

@ -2,7 +2,7 @@
# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
pkgname=oauth2-proxy
pkgver=7.6.0
pkgrel=0
pkgrel=1
pkgdesc="Reverse proxy that provides authentication with Google, Azure, OpenID Connect and many more identity providers"
url="https://oauth2-proxy.github.io/oauth2-proxy"
arch="all"
@ -15,6 +15,8 @@ source="
oauth2-proxy.initd
oauth2-proxy.confd
make-dont-disable-cgo.patch
"
options="net"
@ -37,4 +39,5 @@ sha512sums="
de7574ae6ecf0da0b9962e4601fdc5b7f742fa0d4a55a0e5844256a2aa10170973c324b1041c490b2be0023b954a53d9b78ed488dcd238a2a047e25ab5ba7667 oauth2-proxy-7.6.0.tar.gz
4f91d8bff4ced7fca4d0795c2a0a89e0c8cb28f981db435f30b30f122757b8fe9d855a0d4d87497becedc543cdf48d20f3bc7813728bffaeac891d927157a237 oauth2-proxy.initd
56ec244414ecc96cad80b7c3f231c9e437350046ec80edc3661753bf24e194c51472acf2b097d893f3aed4200b0304e20e9c4d6edd05d698ff54524137c726e7 oauth2-proxy.confd
783bd07239d36e8913836f2f1970e1603ae43d58e643b689fa9d6abaeaf6b34c5e0e250bd13fefecf7b43c45b66cb54170b9f8b913d35d6def28dcb6ea3a5489 make-dont-disable-cgo.patch
"

View File

@ -0,0 +1,16 @@
Fixes: -buildmode=pie requires external (cgo) linking, but cgo is not enabled
This is enforced on riscv64 since go 1.22
diff --git a/Makefile b/Makefile
index 41d01bf..b1d7e17 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ lint: validate-go-version
build: validate-go-version clean $(BINARY)
$(BINARY):
- CGO_ENABLED=0 $(GO) build -a -installsuffix cgo -ldflags="-X main.VERSION=${VERSION}" -o $@ github.com/oauth2-proxy/oauth2-proxy/v7
+ $(GO) build -a -installsuffix cgo -ldflags="-X main.VERSION=${VERSION}" -o $@ github.com/oauth2-proxy/oauth2-proxy/v7
DOCKER_BUILD_PLATFORM ?= linux/amd64,linux/arm64,linux/ppc64le,linux/arm/v7
DOCKER_BUILD_RUNTIME_IMAGE ?= gcr.io/distroless/static:nonroot