deps: fix rpath of 7z after moving to libexecdir (#60098)

(cherry picked from commit 8795edd)

Author: vtjnash

Make.inc

@@ -381,6 +381,10 @@ $(foreach D,build_libdir build_private_libdir,$(eval $(call cache_rel_path,$(D),
 # Save a special one: reverse_private_libdir_rel: usually just `../`, but good to be general:
 reverse_private_libdir_rel_eval = $(call rel_path,$(private_libdir),$(libdir))
 reverse_private_libdir_rel = $(call hit_cache,reverse_private_libdir_rel_eval)
+reverse_private_libexecdir_rel_eval = $(call rel_path,$(private_libexecdir),$(libdir))
+reverse_private_libexecdir_rel = $(call hit_cache,reverse_private_libexecdir_rel_eval)
+reverse_build_private_libexecdir_rel_eval = $(call rel_path,$(build_private_libexecdir),$(build_libdir))
+reverse_build_private_libexecdir_rel = $(call hit_cache,reverse_build_private_libexecdir_rel_eval)
 
 INSTALL_F := $(JULIAHOME)/contrib/install.sh 644
 INSTALL_M := $(JULIAHOME)/contrib/install.sh 755

deps/Makefile

@@ -72,10 +72,12 @@ endif
 endif
 endif
 
+PATCHELF_MANIFEST :=
 ifneq (,$(findstring $(OS),Linux FreeBSD OpenBSD))
 ifeq ($(USE_SYSTEM_PATCHELF), 0)
 DEP_LIBS += patchelf
 PATCHELF:=$(build_depsbindir)/patchelf
+PATCHELF_MANIFEST:=$(build_prefix)/manifest/patchelf
 else
 PATCHELF:=patchelf
 endif

deps/p7zip.mk

@@ -51,10 +51,14 @@ $(eval $(call bb-install,p7zip,P7ZIP,false))
 # move from bindir to shlibdir, where we expect to install it
 install-p7zip: post-install-p7zip
 uninstall-p7zip: pre-uninstall-p7zip
-post-install-p7zip: $(build_prefix)/manifest/p7zip
+post-install-p7zip: $(build_prefix)/manifest/p7zip $(PATCHELF_MANIFEST)
 	mkdir -p $(build_private_libexecdir)/
 	[ ! -e $(build_bindir)/7z$(EXE) ] || mv $(build_bindir)/7z$(EXE) $(build_private_libexecdir)/7z$(EXE)
 	[ -e $(build_private_libexecdir)/7z$(EXE) ]
+ifneq (,$(findstring $(OS),Linux FreeBSD))
+	[ -L $(build_private_libexecdir)/7z ] || \
+	$(PATCHELF) $(PATCHELF_SET_RPATH_ARG) '$$ORIGIN/$(reverse_build_private_libexecdir_rel)' $(build_private_libexecdir)/7z$(EXE)
+endif
 pre-uninstall-p7zip:
 	-rm -f $(build_private_libexecdir)/7z$(EXE)