Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opengl: Accidentally left debug dumps in

Browse Source
This commit is contained in:
Tyson Whitehead
2019-05-15 12:21:55 -04:00
parent fd773491ac
commit cd8953a282
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/opengl/insert-virtualgl.sh
View File

@@ -177,8 +177,8 @@ VGL_elfFilterRPathS() {
eval "declare pathsNew=($(VGL_sourceS "${pathsOld[@]}" | eval "$command"))"
[[ ${pathsNew[@]@Q} = ${pathsOld[@]@Q} ]] \
|| if (( ${#pathsNew[@]} > 0 ));
then ( IFS=:; set -x; patchelf --set-rpath "${pathsNew[*]}" "$file" )
else ( set -x; patchelf --remove-rpath "$file" )
then ( IFS=:; patchelf --set-rpath "${pathsNew[*]}" "$file" )
else ( patchelf --remove-rpath "$file" )
fi
}
@@ -190,10 +190,10 @@ VGL_elfFilterLibsS() {
eval "declare libsNew=($(VGL_sourceS "${libsOld[@]}" | eval "$command"))"
eval "declare libs=($(VGL_sourceS "${libsOld[@]}" | VGL_valuesRemoveS "${libsNew[@]}"))"
(( ${#libs[@]} < 1 )) \
|| ( eval "set -x; patchelf$(printf ' --remove-needed %q' "${libs[@]}") ${file@Q}")
|| ( eval "patchelf$(printf ' --remove-needed %q' "${libs[@]}") ${file@Q}")
eval "declare libs=($(VGL_sourceS "${libsNew[@]}" | VGL_valuesRemoveS "${libsOld[@]}"))"
(( ${#libs[@]} < 1 )) \
|| ( eval "set -x; patchelf$(printf ' --add-needed %q' "${libs[@]}") ${file@Q}")
|| ( eval "patchelf$(printf ' --add-needed %q' "${libs[@]}") ${file@Q}")
}
# Patch elf file to be able to use OpenGL properly (not a stream function so can be called in normal way)
@@ -251,7 +251,6 @@ VGL_autoAddVGL() {
set +o pipefail
echo "Inserting VirtualGL into OpenGL executables in $prefix..." >&2
set -x
for output in $outputs; do
VGL_findS "${!output}" -type f \
| VGL_testKeepS 'VGL_isElfBin "$1"' \