Skip to contentSkip to conversation

zsh: fix installed-vs-shipped with multilib

PATCH New Martin Jansa 1 participant 1 message Apr 4, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zsh: fix installed-vs-shipped with multilib

* fixes:
lib32-zsh-5.8: lib32-zsh: Files/directories were installed but not shipped in any package:
/usr/share/lib32-zsh
/usr/share/lib32-zsh/5.8
/usr/share/lib32-zsh/site-functions
/usr/share/lib32-zsh/5.8/functions
/usr/share/lib32-zsh/5.8/functions/_selinux_users
... 1000+ lines ...
/usr/share/lib32-zsh/5.8/functions/VCS_INFO_bydir_detect
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
lib32-zsh: 1116 installed and not shipped files. [installed-vs-shipped]

* they will clash if someone is trying to install both zsh and lib32-zsh, but it's not very likely as nobody sane was building lib32-zsh with 1000+ line warning regularly

---
 meta-oe/recipes-shells/zsh/zsh_5.8.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-shells/zsh/zsh_5.8.bb +2 -2
index b023e8d297..7602ff9f64 100644
@@ -22,8 +22,8 @@ inherit autotools-brokensep gettext update-alternatives manpages
 EXTRA_OECONF = " \
     --bindir=${base_bindir} \
     --enable-etcdir=${sysconfdir} \
-    --enable-fndir=${datadir}/${PN}/${PV}/functions \
-    --enable-site-fndir=${datadir}/${PN}/site-functions \
+    --enable-fndir=${datadir}/${BPN}/${PV}/functions \
+    --enable-site-fndir=${datadir}/${BPN}/site-functions \
     --with-term-lib='ncursesw ncurses' \
     --with-tcsetpgrp \
     --enable-cap \
Signature · 1 line
2.40.0