forked from qt-creator/qt-creator
Update rpath handling
This commit is contained in:
@@ -76,20 +76,6 @@ build() {
|
|||||||
ret=$?; [ ${ret} = 0 ] || exit ${ret}
|
ret=$?; [ ${ret} = 0 ] || exit ${ret}
|
||||||
}
|
}
|
||||||
|
|
||||||
fix_rpath() {
|
|
||||||
folder=$1
|
|
||||||
pattern=$2
|
|
||||||
rpath=$3
|
|
||||||
(
|
|
||||||
cd "${destdir}" || die "cd failed"
|
|
||||||
while read file ; do
|
|
||||||
echo "Fixing ${file}"
|
|
||||||
chrpath -r "${rpath}" "${file}" 2>&1 | sed 's/^/\t/'
|
|
||||||
done < <(find "${folder}" -type f -name "${pattern}")
|
|
||||||
)
|
|
||||||
ret=$?; [ ${ret} = 0 ] || exit ${ret}
|
|
||||||
}
|
|
||||||
|
|
||||||
inst() {
|
inst() {
|
||||||
(
|
(
|
||||||
cd "${dir}" || die "cd failed"
|
cd "${dir}" || die "cd failed"
|
||||||
@@ -98,19 +84,13 @@ inst() {
|
|||||||
env -i "${MAKE}" install || die "make install failed"
|
env -i "${MAKE}" install || die "make install failed"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Fix rpath's
|
||||||
cd "${destdir}" || die "cd failed"
|
cd "${destdir}" || die "cd failed"
|
||||||
|
find bin -mindepth 1 -maxdepth 1 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../lib'
|
||||||
# Fix files bin/*
|
find lib -mindepth 1 -maxdepth 1 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN'
|
||||||
fix_rpath bin '*' '$ORIGIN/../lib'
|
find . -mindepth 3 -maxdepth 3 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../lib'
|
||||||
|
find . -mindepth 4 -maxdepth 4 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../../lib'
|
||||||
# Fix files lib/*.so
|
find . -mindepth 5 -maxdepth 5 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../../../lib'
|
||||||
fix_rpath lib '*.so.?.?.?.debug' '$ORIGIN'
|
|
||||||
|
|
||||||
# Fix files examples/tools/*/*/*.so
|
|
||||||
fix_rpath examples/tools '*.so' '$ORIGIN/../../../lib'
|
|
||||||
|
|
||||||
# Fix files plugins/*/*.so
|
|
||||||
fix_rpath plugins '*.so' '$ORIGIN/../../lib'
|
|
||||||
)
|
)
|
||||||
ret=$?; [ ${ret} = 0 ] || exit ${ret}
|
ret=$?; [ ${ret} = 0 ] || exit ${ret}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user