[arch-commits] Commit in caddy/trunk (PKGBUILD)

[Morten Linderud]

    Date: Sunday, July 5, 2020 @ 14:17:45
  Author: foxboron
Revision: 657831

upgpkg: caddy 1.0.5-2

Updated with go package guidelines

Modified:
  caddy/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-05 14:12:06 UTC (rev 657830)
+++ PKGBUILD	2020-07-05 14:17:45 UTC (rev 657831)
@@ -9,13 +9,13 @@
 pkgver=1.0.5
 _gitcommit=11ae1aa6b88e45b077dd97cb816fe06cd91cca67
 _distcommit=9e93bfd85c97d71ab842a4a4b555d358295c914e
-pkgrel=1
+pkgrel=2
 pkgdesc='HTTP/2 Web Server with Automatic HTTPS'
 url='https://caddyserver.com'
 arch=('x86_64')
 license=('Apache')
 depends=('glibc')
-makedepends=('go-pie' 'git')
+makedepends=('go' 'git')
 backup=('etc/caddy/caddy.conf')
 source=("git+https://github.com/caddyserver/caddy#commit=${_gitcommit}?signed"
         caddy-${_distcommit}-index.html::https://raw.githubusercontent.com/caddyserver/dist/${_distcommit}/welcome/index.html
@@ -65,10 +65,12 @@
 
 build() {
   cd ${pkgname}/caddy
-  go build -v \
-    -trimpath \
-    -ldflags "-extldflags ${LDFLAGS}" \
-    .
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -modcacherw"
+  go build -v .
 }
 
 package() {