Skip to content

Commit cff8e13

Browse files
vtjnashKristofferC
authored andcommitted
deps: fix rpath of 7z after moving to libexecdir (#60098)
(cherry picked from commit 8795edd)
1 parent 013c7af commit cff8e13

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

deps/p7zip.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,14 @@ $(eval $(call bb-install,p7zip,P7ZIP,false))
5151
# move from bindir to shlibdir, where we expect to install it
5252
install-p7zip: post-install-p7zip
5353
uninstall-p7zip: pre-uninstall-p7zip
54-
post-install-p7zip: $(build_prefix)/manifest/p7zip
54+
post-install-p7zip: $(build_prefix)/manifest/p7zip $(PATCHELF_MANIFEST)
5555
mkdir -p $(build_private_libexecdir)/
5656
[ ! -e $(build_bindir)/7z$(EXE) ] || mv $(build_bindir)/7z$(EXE) $(build_private_libexecdir)/7z$(EXE)
5757
[ -e $(build_private_libexecdir)/7z$(EXE) ]
58+
ifneq (,$(findstring $(OS),Linux FreeBSD))
59+
[ -L $(build_private_libexecdir)/7z ] || \
60+
$(PATCHELF) $(PATCHELF_SET_RPATH_ARG) '$$ORIGIN/$(reverse_build_private_libexecdir_rel)' $(build_private_libexecdir)/7z$(EXE)
61+
endif
5862
pre-uninstall-p7zip:
5963
-rm -f $(build_private_libexecdir)/7z$(EXE)
6064

0 commit comments

Comments
 (0)