aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-08-25 16:19:11 +0000
committerMike Frysinger <vapier@gentoo.org>2011-08-25 16:19:11 +0000
commit4e6f1fb1f35411741045066f9e879cf3522e4222 (patch)
tree5224c20d80fcfdc47e17b01be5290794f6f54298
parentopengl.eselect: Remove ROOT from LDPATH in env.d #316921 by Ambroz Bizjak (diff)
downloadeselect-4e6f1fb1f35411741045066f9e879cf3522e4222.tar.gz
eselect-4e6f1fb1f35411741045066f9e879cf3522e4222.tar.bz2
eselect-4e6f1fb1f35411741045066f9e879cf3522e4222.zip
opengl: use simpler scanelf logic to avoid bash parsing #380585
svn path=/trunk/extern/; revision=825
-rw-r--r--modules/opengl.eselect3
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/opengl.eselect b/modules/opengl.eselect
index 31854a0..9122e1c 100644
--- a/modules/opengl.eselect
+++ b/modules/opengl.eselect
@@ -91,8 +91,7 @@ setup_soname_symlinks() {
# in order to be easy to find and faster to grab
if [[ ${file} == *.so || ${file} == *.dylib ]] ; then
[[ ${file} == *.so ]] && scanner=scanelf || scanner="scanmacho"
- soname=$(${scanner} -qBF '%S|%p' "${file}" | head -n1)
- soname=${soname%|*} # stupid scanelf must print filename
+ soname=$(${scanner} -qBF '%S#p' "${file}" | head -n1)
[[ ${file} == *.so ]] && soname="${file%/*}"/${soname}
upgrade_file "${soname}" "${target}"
fi