From b29ce87bb40a964a45f16585ed04c969ed576863 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 1 Jul 2025 00:05:51 -0700 Subject: [PATCH] nbdkit: Fix build after S moved into UNPACKDIR Signed-off-by: Khem Raj --- ...plugins-Avoid-absolute-buildpaths-in-binaries.patch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch b/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch index 2f7ffd3d20..524ea0602d 100644 --- a/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch +++ b/meta-networking/recipes-support/nbdkit/nbdkit/0002-plugins-Avoid-absolute-buildpaths-in-binaries.patch @@ -14,15 +14,14 @@ Signed-off-by: Khem Raj plugins/cc/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -diff --git a/plugins/cc/Makefile.am b/plugins/cc/Makefile.am -index df8b5d15..80586a17 100644 --- a/plugins/cc/Makefile.am +++ b/plugins/cc/Makefile.am -@@ -44,9 +44,12 @@ nbdkit_cc_plugin_la_SOURCES = \ +@@ -44,9 +44,13 @@ nbdkit_cc_plugin_la_SOURCES = \ $(top_srcdir)/include/nbdkit-plugin.h \ $(NULL) -+workdir := $(shell dirname $(abs_top_builddir)) ++workdir1 := $(shell dirname $(abs_top_builddir)) ++workdir := $(shell dirname $(workdir1)) +cc_no_sysroot := $(shell echo \"$(CC)\"|sed -e 's#$(workdir)##g') +cflags_no_sysroot := $(shell echo \"$(CFLAGS)\"|sed -e 's#$(workdir)##g') nbdkit_cc_plugin_la_CPPFLAGS = \ @@ -33,6 +32,3 @@ index df8b5d15..80586a17 100644 -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/common/include \ --- -2.40.1 -