pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-07-12 08:00:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '304-build-system-don-t-override-an-existing-rpath' into 'master'

Browse Source 
Resolve "build-system: don't override an existing RPATH"

Closes #304

See merge request Pmodules/src!283
This commit is contained in:
gsell
2024-08-09 21:16:49 +02:00
parent 5325736761 2012d9bf07
commit f026c5d829
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libpbuild.bash
+6
View File
@@ -1291,12 +1291,18 @@ _build_module() {
local -- rpath=''
local -i depth=0
for fname in "${bin_objects[@]}"; do
# don't override existing RPATH
rpath=$(patchelf --print-rpath "${fname}")
[[ -z "${rpath}" ]] || continue
(( depth=$(std::get_dir_depth "${fname}") + group_depth + 3 ))
rpath='$ORIGIN/'$(printf "../%.0s" $(${seq} 1 ${depth}))lib64
${patchelf} --force-rpath --set-rpath "${rpath}" "${fname}"
done
mapfile -t bin_objects < <(std::find_shared_objects '.')
for fname in "${bin_objects[@]}"; do
# don't override existing RPATH
rpath=$(patchelf --print-rpath "${fname}")
[[ -z "${rpath}" ]] || continue
(( depth=$(std::get_dir_depth "${fname}") + group_depth + 3 ))
rpath='$ORIGIN/'$(printf "../%.0s" $(${seq} 1 ${depth}))lib64
${patchelf} --force-rpath --set-rpath "${rpath}" "${fname}"