Commitcff8e13

authored and

KristofferC

committed

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

(cherry picked from commit8795edd)

1 parent013c7af commitcff8e13Copy full SHA for cff8e13

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,14 @@ $(eval $(call bb-install,p7zip,P7ZIP,false))`
`51`	`51`	`# move from bindir to shlibdir, where we expect to install it`
`52`	`52`	`install-p7zip: post-install-p7zip`
`53`	`53`	`uninstall-p7zip: pre-uninstall-p7zip`
`54`		`-post-install-p7zip:$(build_prefix)/manifest/p7zip`
	`54`	`+post-install-p7zip:$(build_prefix)/manifest/p7zip$(PATCHELF_MANIFEST)`
`55`	`55`	`mkdir -p$(build_private_libexecdir)/`
`56`	`56`	`[!-e$(build_bindir)/7z$(EXE) ]\|\| mv$(build_bindir)/7z$(EXE)$(build_private_libexecdir)/7z$(EXE)`
`57`	`57`	`[-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`
`58`	`62`	`pre-uninstall-p7zip:`
`59`	`63`	`-rm -f$(build_private_libexecdir)/7z$(EXE)`
`60`	`64`

Comments

(0)