diff mbox series

[meta-darwin,05/21] zstd: rebase LC_RPATH patch for upstream's new zstdmt guard, scope to darwin21

Message ID 20261014141209.488034-5-ecordonnier@snap.com
State New
Headers show
Series [meta-darwin,01/21] meta-darwin: bump layer series to wrynose (6.0.3) | expand

Commit Message

Etienne Cordonnier Oct. 14, 2026, 2:10 p.m. UTC 
From: Etienne Cordonnier <ecordonnier@snap.com>

Upstream zstd 1.5.7 inserted a new "if ... zstdmt ... exit 1; fi"
safety check into the libzstd-nomt target, shifting hunk #2's context
enough that it no longer applies (hunk #1 already applied with a
6-line offset, a symptom of the same drift). The underlying duplicate
-LDFLAGS bug this patch fixes is unchanged in 1.5.7 (the same
"$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS)" line is still there
verbatim), so rebase rather than drop it.

Also scope SRC_URI:append from class-nativesdk to darwin21: LC_RPATH
is a Mach-O/macOS linker concept, and class-nativesdk also covers
other SDK hosts (e.g. mingw32) where this patch has no business being
applied at all.

AI-Generated: Claude Sonnet 5

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 .../zstd/0001-Fix-duplicate-LC_RPATH-error-on-MacOS.patch | 8 ++++----
 recipes-extended/zstd/zstd_%.bbappend                     | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/recipes-extended/zstd/zstd/0001-Fix-duplicate-LC_RPATH-error-on-MacOS.patch b/recipes-extended/zstd/zstd/0001-Fix-duplicate-LC_RPATH-error-on-MacOS.patch
index b765082..5b6d675 100644
--- a/recipes-extended/zstd/zstd/0001-Fix-duplicate-LC_RPATH-error-on-MacOS.patch
+++ b/recipes-extended/zstd/zstd/0001-Fix-duplicate-LC_RPATH-error-on-MacOS.patch
@@ -34,10 +34,10 @@  index a4cf61ab..e1ffba91 100644
  	@echo creating versioned links
  	ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
  	ln -sf $@ libzstd.$(SHARED_EXT)
-@@ -236,7 +236,7 @@ libzstd-nomt: LDFLAGS += -shared
- libzstd-nomt: $(ZSTD_NOMT_FILES)
- 	@echo compiling single-thread dynamic library $(LIBVER)
- 	@echo files : $(ZSTD_NOMT_FILES)
+@@ -255,7 +255,7 @@ libzstd-nomt: $(ZSTD_NOMT_FILES)
+         echo "Error: Found zstdmt in list."; \
+         exit 1; \
+     fi
 -	$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 +	$(CC) $(FLAGS) $^ $(SONAME_FLAGS) -o $@
  
diff --git a/recipes-extended/zstd/zstd_%.bbappend b/recipes-extended/zstd/zstd_%.bbappend
index 8572d37..2d6b5d5 100644
--- a/recipes-extended/zstd/zstd_%.bbappend
+++ b/recipes-extended/zstd/zstd_%.bbappend
@@ -2,4 +2,7 @@  FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 EXTRA_OEMAKE:append:darwin21 = " UNAME='Darwin'"
 
-SRC_URI:append:class-nativesdk = " file://0001-Fix-duplicate-LC_RPATH-error-on-MacOS.patch"
+# LC_RPATH is a Mach-O/macOS linker concept; class-nativesdk also covers
+# other SDK hosts (e.g. mingw32), where this patch doesn't apply. Scope to
+# darwin21 like EXTRA_OEMAKE above.
+SRC_URI:append:darwin21 = " file://0001-Fix-duplicate-LC_RPATH-error-on-MacOS.patch"