fix: zfs-tools libtirpc path

Use a custom path for libtirpc shipped with zfs-tools so that it doesn't conflict with libtirpc built for nvidia-container-toolkit (as it's linked against glibc). Fixes: siderolabs#380 Signed-off-by: Noel Georgi <git@frezbo.dev>
frezbo · Jun 7, 2024 · 9c7e77b · 9c7e77b
1 parent cce3b41
commit 9c7e77b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/guest-agents/qemu-guest-agent/glib/pkg.yaml b/guest-agents/qemu-guest-agent/glib/pkg.yaml
@@ -24,7 +24,7 @@ steps:
         pip3 install ninja packaging
     build:
       - |
-        export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+        export _PATH=/usr/lib/pkgconfig
 
         meson setup \
           --prefix=/usr \

diff --git a/storage/zfs/zfs-tools/libtirpc/pkg.yaml b/storage/zfs/zfs-tools/libtirpc/pkg.yaml
@@ -26,7 +26,7 @@ steps:
         export CFLAGS="${CFLAGS} -I/usr/local/include"
 
         ./configure \
-          --prefix=/usr/local \
+          --prefix=/usr/local/libtirpc \
           --disable-gssapi
     build:
       - |

diff --git a/storage/zfs/zfs-tools/pkg.yaml b/storage/zfs/zfs-tools/pkg.yaml
@@ -20,6 +20,8 @@ steps:
         tar -xf zfs.tar.gz --strip-components=1
     build:
       - |
+        export PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/libtirpc/lib/pkgconfig
+
         ./configure \
           --prefix=/usr/local \
           --with-udevdir=/usr/local/sbin \