community/containerd: fix compilation on mips64

3 files changed, 50 insertions, 6 deletions

diff --git a/community/containerd/APKBUILD b/community/containerd/APKBUILD
index 0da5150ba0..604f36408f 100644
--- a/community/containerd/APKBUILD
+++ b/community/containerd/APKBUILD
@@ -9,12 +9,14 @@ pkgver=1.3.4
 pkgrel=1
 pkgdesc="An open and reliable container runtime"
 url="https://containerd.io"
-arch="all !mips !mips64" # blocked by runc
+arch="all"
 license="Apache-2.0"
 depends="runc"
 makedepends="btrfs-progs-dev go go-md2man libseccomp-dev"
 subpackages="$pkgname-doc"
-source="containerd-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz"
+source="containerd-$pkgver.tar.gz::https://github.com/containerd/containerd/archive/v$pkgver.tar.gz
+        make-buildmode-configurable.patch
+        fix-mips64-stat-struct.patch"
 builddir="$srcdir/src/github.com/containerd/containerd"
 
 # secfixes:
@@ -34,13 +36,23 @@ builddir="$srcdir/src/github.com/containerd/containerd"
 #   1.2.6-r0:
 #     - CVE-2019-9946
 
-build() {
+prepare() {
         cd "$srcdir"
         export GOPATH="$PWD"
-        mkdir -p $(dirname "$builddir")
+        mkdir -p $(dirname "$srcdir/src/github.com/containerd/containerd")
         ln -s "$PWD/$pkgname-$pkgver" "$builddir"
         cd "$builddir"
-        make VERSION="v$pkgver" REVISION="$_commit"
+
+        default_prepare
+}
+
+build() {
+        case "$CARCH" in
+                mips64*) buildmode=exe;;
+                *) buildmode=pie;;
+        esac
+
+        make VERSION="v$pkgver" REVISION="$_commit" BUILDMODE="$buildmode"
         make man
 }
 
@@ -57,4 +69,6 @@ package() {
         install -Dm644 "$builddir"/man/*.8 "$pkgdir"/usr/share/man/man8/
 }
 
-sha512sums="b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa  containerd-1.3.4.tar.gz"
+sha512sums="b186d5aef3e5a0d35c12dcc3cfa5d48a9602f6278c4650942859a1ab6abd1299d33a1bc623376955a834a2626491196b604591d92a05d39745dfc33ff51ad5aa  containerd-1.3.4.tar.gz
+b38ce6d31bfba2e74413887237f5b8abb4fa06d36937d9a73a612a1be10a79927b7f6643f2dd10bee4361b9f5cf11e6349052ab24795ce7d176eae2add3e4d72  make-buildmode-configurable.patch
+c591b18386dbf39aff358007bcc4704f8e668e93002c73fd61090f4c6bb5b52ccb84813e9f82136bf4de6531b1404ecea71a05a6af63ba96daa3b354e4a290ab  fix-mips64-stat-struct.patch"
diff --git a/community/containerd/fix-mips64-stat-struct.patch b/community/containerd/fix-mips64-stat-struct.patch
new file mode 100644
index 0000000000..35fe2597ac
--- /dev/null
+++ b/community/containerd/fix-mips64-stat-struct.patch
@@ -0,0 +1,13 @@
+diff --git a/vendor/github.com/docker/docker/pkg/system/stat_linux.go b/vendor/github.com/docker/docker/pkg/system/stat_linux.go
+index 1939f95..af7af20 100644
+--- a/vendor/github.com/docker/docker/pkg/system/stat_linux.go
++++ b/vendor/github.com/docker/docker/pkg/system/stat_linux.go
+@@ -8,7 +8,7 @@ func fromStatT(s *syscall.Stat_t) (*StatT, error) {
+                mode: s.Mode,
+                uid:  s.Uid,
+                gid:  s.Gid,
+-               rdev: s.Rdev,
++               rdev: uint64(s.Rdev),
+                mtim: s.Mtim}, nil
+ }
+ 
diff --git a/community/containerd/make-buildmode-configurable.patch b/community/containerd/make-buildmode-configurable.patch
new file mode 100644
index 0000000000..25c131d9dd
--- /dev/null
+++ b/community/containerd/make-buildmode-configurable.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile.linux b/Makefile.linux
+index 7b27008..0afa70c 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -17,10 +17,11 @@
+ WHALE="+"
+ ONI="-"
+ COMMANDS += containerd-shim containerd-shim-runc-v1 containerd-shim-runc-v2
++BUILDMODE := pie
+ 
+ # check GOOS for cross compile builds
+ ifeq ($(GOOS),linux)
+-       GO_GCFLAGS += -buildmode=pie
++       GO_GCFLAGS += -buildmode=$(BUILDMODE)
+ endif
+ 
+ # amd64 supports go test -race