From 9b4a2209661be746feff9fb80b8db87511cde6ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 24 Aug 2023 21:03:52 +0700 Subject: [PATCH] caddy: build for go1.20 --- srcpkgs/caddy/template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template index af8445bb2ce..432e1b8271e 100644 --- a/srcpkgs/caddy/template +++ b/srcpkgs/caddy/template @@ -1,10 +1,11 @@ # Template file for 'caddy' pkgname=caddy version=2.6.4 -revision=3 +revision=4 build_style=go go_import_path=github.com/caddyserver/caddy/v2 go_package="${go_import_path}/cmd/caddy" +hostmakedepends="go1.20" depends="shared-mime-info" short_desc="Fast, cross-platform HTTP/2 web server with automatic HTTPS" maintainer="Orphaned " @@ -19,6 +20,7 @@ caddy_homedir="/var/lib/caddy" caddy_descr="caddy daemon" conf_files="/etc/caddy/Caddyfile" +export GOTOOLCHAIN=go1.20 make_dirs=" /etc/caddy 0700 caddy caddy @@ -30,10 +32,6 @@ post_patch() { vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go } -pre_build() { - export GOTOOLCHAIN="go1.20.7" -} - post_install() { vsv caddy