summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2024-01-01 14:41:15 -0700
committerMark Wagie2024-01-01 14:41:15 -0700
commit9da63a62f30641c16ab862157f0088e805f6e693 (patch)
tree448e57e4431c5f2de86e18f71f4f401e4e0fb1b4
parent82443645d6b22ddf866756e81025f702431a45ff (diff)
downloadaur-9da63a62f30641c16ab862157f0088e805f6e693.tar.gz
update patch
-rw-r--r--.SRCINFO4
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD6
-rw-r--r--go-nvml-79.patch37
4 files changed, 43 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2c84ab5f416f..2fc9ef4e770e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,8 +13,8 @@ pkgbase = nvidia-container-toolkit
replaces = nvidia-container-runtime-hook
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 = https://github.com/NVIDIA/go-nvml/pull/79.patch
+ source = go-nvml-79.patch
sha256sums = a8dbb6a8d45fe8cb2ecbb7b5d49c332e0e7270e8988e57d2a8587ab1e004f6dd
- sha256sums = 9909db17ef060f3f2da384018217e2009182203b516dd8242ff86b8d6e8b7ca1
+ sha256sums = 24182b216338472867bf0d597b9318281998b8f352e612c997913fa7a829f32b
pkgname = nvidia-container-toolkit
diff --git a/.gitignore b/.gitignore
index 4dab8d6386e3..bbe597a54be1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
!.gitignore
!PKGBUILD
!.SRCINFO
+!go-nvml-79.patch
diff --git a/PKGBUILD b/PKGBUILD
index 3f089bbb4a70..3a23673889d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,9 +14,9 @@ conflicts=('nvidia-container-runtime-hook' 'nvidia-container-runtime<2.0.0')
replaces=('nvidia-container-runtime-hook')
backup=('etc/nvidia-container-runtime/config.toml')
source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
- 'https://github.com/NVIDIA/go-nvml/pull/79.patch')
+ 'go-nvml-79.patch')
sha256sums=('a8dbb6a8d45fe8cb2ecbb7b5d49c332e0e7270e8988e57d2a8587ab1e004f6dd'
- '9909db17ef060f3f2da384018217e2009182203b516dd8242ff86b8d6e8b7ca1')
+ '24182b216338472867bf0d597b9318281998b8f352e612c997913fa7a829f32b')
prepare() {
cd "${pkgname}-${pkgver}"
@@ -25,7 +25,7 @@ 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/79.patch"
+ git apply "$srcdir/go-nvml-79.patch"
}
build() {
diff --git a/go-nvml-79.patch b/go-nvml-79.patch
new file mode 100644
index 000000000000..b4ed2bb9e170
--- /dev/null
+++ b/go-nvml-79.patch
@@ -0,0 +1,37 @@
+From b8d34ba5dc71c7b5a261bbdfdec63fe337fac2a5 Mon Sep 17 00:00:00 2001
+From: braydonk <braydonk@google.com>
+Date: Tue, 3 Oct 2023 03:32:50 +0000
+Subject: [PATCH] gen/nvml: add --export-dynamic linker flag
+
+Signed-off-by: braydonk <braydonk@google.com>
+---
+ pkg/nvml/const.go | 2 +-
+ pkg/nvml/nvml.go | 2 +-
+ 32files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pkg/nvml/const.go b/pkg/nvml/const.go
+index 1a0efaf..a9a3a56 100644
+--- a/pkg/nvml/const.go
++++ b/pkg/nvml/const.go
+@@ -18,7 +18,7 @@
+ package nvml
+
+ /*
+-#cgo LDFLAGS: -Wl,--unresolved-symbols=ignore-in-object-files
++#cgo LDFLAGS: -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files
+ #cgo CFLAGS: -DNVML_NO_UNVERSIONED_FUNC_DEFS=1
+ #include "nvml.h"
+ #include <stdlib.h>
+diff --git a/pkg/nvml/nvml.go b/pkg/nvml/nvml.go
+index f63dfe8..bf2d6fc 100644
+--- a/pkg/nvml/nvml.go
++++ b/pkg/nvml/nvml.go
+@@ -18,7 +18,7 @@
+ package nvml
+
+ /*
+-#cgo LDFLAGS: -Wl,--unresolved-symbols=ignore-in-object-files
++#cgo LDFLAGS: -Wl,--export-dynamic -Wl,--unresolved-symbols=ignore-in-object-files
+ #cgo CFLAGS: -DNVML_NO_UNVERSIONED_FUNC_DEFS=1
+ #include "nvml.h"
+ #include <stdlib.h>