disable makeflags, use Go 1.20.8

2 files changed, 11 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3919607c4ea4..0bd14d2b85b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nvidia-container-toolkit
 	pkgdesc = NVIDIA container runtime toolkit
 	pkgver = 1.14.3
-	pkgrel = 7
+	pkgrel = 8
 	url = https://github.com/NVIDIA/nvidia-container-toolkit
 	arch = x86_64
 	license = Apache
@@ -11,11 +11,10 @@ pkgbase = nvidia-container-toolkit
 	conflicts = nvidia-container-runtime-hook
 	conflicts = nvidia-container-runtime<2.0.0
 	replaces = nvidia-container-runtime-hook
+	options = !makeflags
 	options = !lto
 	backup = etc/nvidia-container-runtime/config.toml
 	source = nvidia-container-toolkit-1.14.3.tar.gz::https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.14.3.tar.gz
-	source = go-nvml-79.patch
 	sha256sums = a8dbb6a8d45fe8cb2ecbb7b5d49c332e0e7270e8988e57d2a8587ab1e004f6dd
-	sha256sums = 24182b216338472867bf0d597b9318281998b8f352e612c997913fa7a829f32b
 
 pkgname = nvidia-container-toolkit
diff --git a/PKGBUILD b/PKGBUILD
index ecd120bac7ff..a264e54dc71c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Julie Shapiro <jshapiro at nvidia dot com>
 pkgname=nvidia-container-toolkit
 pkgver=1.14.3
-pkgrel=7
+pkgrel=8
 pkgdesc="NVIDIA container runtime toolkit"
 arch=('x86_64')
 url="https://github.com/NVIDIA/nvidia-container-toolkit"
@@ -13,11 +13,11 @@ makedepends=('git' 'go')
 conflicts=('nvidia-container-runtime-hook' 'nvidia-container-runtime<2.0.0')
 replaces=('nvidia-container-runtime-hook')
 backup=('etc/nvidia-container-runtime/config.toml')
-options=('!lto') # flag provided but not defined: -flto
+options=('!makeflags' '!lto')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-        'go-nvml-79.patch')
-sha256sums=('a8dbb6a8d45fe8cb2ecbb7b5d49c332e0e7270e8988e57d2a8587ab1e004f6dd'
-            '24182b216338472867bf0d597b9318281998b8f352e612c997913fa7a829f32b')
+#        'go-nvml-79.patch'
+        )
+sha256sums=('a8dbb6a8d45fe8cb2ecbb7b5d49c332e0e7270e8988e57d2a8587ab1e004f6dd')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -25,19 +25,16 @@ prepare() {
 
   # gen/nvml: add --export-dynamic linker flag
   # https://github.com/NVIDIA/go-nvml/issues/36
-  cd vendor/github.com/NVIDIA/go-nvml
-  git apply "$srcdir/go-nvml-79.patch"
+#  cd vendor/github.com/NVIDIA/go-nvml
+#  git apply "$srcdir/go-nvml-79.patch"
 }
 
 build() {
   cd "$pkgname-$pkgver"
   export GOPATH="$srcdir/gopath"
+  export GOTOOLCHAIN=go1.20.8
   go build -v \
-    -trimpath \
-    -buildmode=pie \
-    -mod=vendor \
-    -modcacherw \
-    -ldflags "-linkmode external -extldflags \"${LDFLAGS}\" -s -w -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.version=$pkgver" \
+    -ldflags "-extldflags=-Wl,-z,lazy -s -w -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.version=$pkgver" \
     -o build ./...
 
   # Clean module cache for makepkg -C