mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

build(snap): remove manual patchelf from cleanup part

Browse source 
Through some experimentation with the arm64 build,
it seems that the magick binary is indeed patched
correctly by snapcraft.

This commit removes an ugly section of the cleanup
part. I've tested the resulting snap, and all
features still work as far as I can tell, despite
linter warnings in the snapcraft build.

This also resolves an issue that was occurring with
the manual patchelf on arm64 systems.
This commit is contained in:
Jon Seager 2025-01-17 10:36:13 +02:00
parent 0311bcecc4
commit 84fc372c56
No known key found for this signature in database
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
snap/snapcraft.yaml
View file

@ -133,9 +133,6 @@ parts:
- usr/lib/libMagickCore-7.Q16HDRI.so* - usr/lib/libMagickCore-7.Q16HDRI.so*
- usr/lib/libMagickWand-7.Q16HDRI.so* - usr/lib/libMagickWand-7.Q16HDRI.so*
# Most of what is done here should be done in the `yazi` part, but using
# `override-prime` there stops snapcraft from automatically patching ELF
# binaries (due to a bug), so we do that work here in a separate part.
cleanup: cleanup:
after: [yazi, magick] after: [yazi, magick]
plugin: nil plugin: nil
@ -149,14 +146,6 @@ parts:
# executable at $SNAP/usr/bin/7zz. # executable at $SNAP/usr/bin/7zz.
mv $CRAFT_PRIME/usr/lib/7zip/7zz $CRAFT_PRIME/usr/bin/7zz mv $CRAFT_PRIME/usr/lib/7zip/7zz $CRAFT_PRIME/usr/bin/7zz
# The snapcraft linter highlighted issues with the rpath of these two libraries,
# so we fix them up manually here after they are primed in the yazi part.
patchelf --force-rpath --set-rpath "\$ORIGIN:\$ORIGIN/pulseaudio:/snap/core24/current/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" $CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libpulse.so.0.24.2
patchelf --force-rpath --set-rpath "\$ORIGIN/lapack:\$ORIGIN/blas:\$ORIGIN:/snap/core24/current/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" $CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libsphinxbase.so.3.0.0
patchelf --force-rpath --set-rpath "\$ORIGIN/../lib:\$ORIGIN/../lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/core24/current/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" $CRAFT_PRIME/usr/bin/magick
patchelf --force-rpath --set-rpath "\$ORIGIN/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/core24/current/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" $CRAFT_PRIME/usr/lib/libMagickCore-7.Q16HDRI.so.10.0.2
patchelf --force-rpath --set-rpath "\$ORIGIN:\$ORIGIN/$CRAFT_ARCH_TRIPLET_BUILD_FOR:/snap/core24/current/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR" $CRAFT_PRIME/usr/lib/libMagickWand-7.Q16HDRI.so.10.0.2
# Ensure we don't ship duplicates of files that exist in the core24 # Ensure we don't ship duplicates of files that exist in the core24
# snap. # snap.
cd /snap/core24/current cd /snap/core24/current