diff mbox series

[meta-networking] nbdkit: Fix build after S moved into UNPACKDIR

Message ID 20250701070649.2751375-1-raj.khem@gmail.com
State New
Headers show
Series [meta-networking] nbdkit: Fix build after S moved into UNPACKDIR | expand

Commit Message

Khem Raj July 1, 2025, 7:06 a.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...plugins-Avoid-absolute-buildpaths-in-binaries.patch | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
diff mbox series

Patch

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 <raj.khem@gmail.com>
  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)#<WORKDIR>#g')
 +cflags_no_sysroot := $(shell echo \"$(CFLAGS)\"|sed -e 's#$(workdir)#<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
-