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

[Morten Linderud]

    Date: Monday, August 17, 2020 @ 16:08:48
  Author: foxboron
Revision: 682780

upgpkg: containerd 1.4.0-1

Modified:
  containerd/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-17 16:08:45 UTC (rev 682779)
+++ PKGBUILD	2020-08-17 16:08:48 UTC (rev 682780)
@@ -4,9 +4,9 @@
 # Contributor: Iwan Timmer <irtimmer at gmail.com>
 
 pkgname=containerd
-pkgver=1.3.4
-_commit=d76c121f76a5fc8a462dc64594aea72fe18e1178
-pkgrel=2
+pkgver="1.4.0"
+_commit=be75852b8d7849474a20192f9ed1bf34fdd454f1
+pkgrel=1
 pkgdesc='An open and reliable container runtime'
 url='https://containerd.io/'
 depends=('runc')
@@ -14,11 +14,8 @@
 arch=('x86_64')
 license=("Apache")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz")
-sha256sums=('374d0c944985a64a7f31da4018aaa6d7a0b123122633ce28ab04cf1203f785b8')
+sha256sums=('d6284c69e1933e4c05fe285feebef461efe8cd2030634dcf1cbdcde46abe86be')
 
-# bbolt 1.3.3 is broken with go 1.14 and 1.3.4 is unstable:
-# https://github.com/etcd-io/bbolt/issues/214
-
 prepare() {
   mkdir -p src/github.com/containerd
   ln -rTsf $pkgname-$pkgver src/github.com/containerd/containerd
@@ -31,13 +28,17 @@
   export GOPATH="$srcdir"
   cd src/github.com/containerd/containerd
   export CGO_LDFLAGS="$LDFLAGS"
-  export GOFLAGS="-trimpath"
-  make VERSION=v$pkgver.m REVISION=$_commit.m
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
+  make EXTRA_LDFLAGS="-linkmode external" VERSION=v$pkgver.m REVISION=$_commit.m
 }
 
 check() {
   cd src/github.com/containerd/containerd
-  make test
+  GOFLAGS="" make test
 }
 
 package() {