| 1 |
Author: scarabeus |
| 2 |
Date: 2011-01-26 19:20:39 +0000 (Wed, 26 Jan 2011) |
| 3 |
New Revision: 801 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/extern/modules/opengl.eselect |
| 7 |
Log: |
| 8 |
Integrate last batch of prefix changes. |
| 9 |
|
| 10 |
Modified: trunk/extern/modules/opengl.eselect |
| 11 |
=================================================================== |
| 12 |
--- trunk/extern/modules/opengl.eselect 2011-01-14 20:33:17 UTC (rev 800) |
| 13 |
+++ trunk/extern/modules/opengl.eselect 2011-01-26 19:20:39 UTC (rev 801) |
| 14 |
@@ -17,12 +17,12 @@ |
| 15 |
MAINTAINER="x11@g.o" |
| 16 |
SVN_DATE='$Date$' |
| 17 |
VERSION=$(svn_date_to_version "${SVN_DATE}" ) |
| 18 |
-EBUILD_VERSION="1.2.0" |
| 19 |
+EBUILD_VERSION="1.2.1" |
| 20 |
|
| 21 |
# Our data |
| 22 |
-ENV_FILE="${ROOT}/etc/env.d/03opengl" |
| 23 |
-PREFIX="${ROOT}/usr" |
| 24 |
-DST_PREFIX="${ROOT}/usr" |
| 25 |
+ENV_FILE="${EROOT}/etc/env.d/03opengl" |
| 26 |
+PREFIX="${EROOT}/usr" |
| 27 |
+DST_PREFIX="${EROOT}/usr" |
| 28 |
|
| 29 |
get_current_implementation() { |
| 30 |
local ret |
| 31 |
@@ -47,7 +47,7 @@ |
| 32 |
local dir_name |
| 33 |
|
| 34 |
for libdir in $(list_libdirs) ; do |
| 35 |
- [[ ${ROOT} != / ]] && libdir=${libdir#${ROOT}} |
| 36 |
+ [[ ${ROOT} != / ]] && libdir=${libdir#${EROOT}} |
| 37 |
for dir in "${PREFIX}/${libdir}"/opengl/* ; do |
| 38 |
dir_name=$(basename "${dir}") |
| 39 |
[[ -d ${dir} && ${dir_name} != "global" ]] || continue |
| 40 |
@@ -83,13 +83,17 @@ |
| 41 |
setup_soname_symlinks() { |
| 42 |
local file=$1 |
| 43 |
local target=$2 |
| 44 |
+ local soname |
| 45 |
+ local scanner |
| 46 |
|
| 47 |
- if [[ ${file} == *.so ]] ; then |
| 48 |
- # if we have .so we need to make its soname symlinked |
| 49 |
- # in order to be easy to find and faster to grab |
| 50 |
- soname=$(scanelf -qBF '%S|%p' "${file}") |
| 51 |
+ # if we have .so or dylib we need to make its soname symlinked |
| 52 |
+ # in order to be easy to find and faster to grab |
| 53 |
+ if [[ ${file} == *.so || ${file} == *.dylib ]] ; then |
| 54 |
+ [[ ${file} == *.so ]] && scanner=scanelf || scanner="scanmacho" |
| 55 |
+ soname=$(${scanner} -qBF '%S|%p' "${file}" | head -n1) |
| 56 |
soname=${soname%|*} # stupid scanelf must print filename |
| 57 |
- upgrade_file "${file%/*}"/${soname} "${target}" |
| 58 |
+ [[ ${file} == *.so ]] && soname="${file%/*}"/${soname} |
| 59 |
+ upgrade_file "${soname}" "${target}" |
| 60 |
fi |
| 61 |
} |
| 62 |
|
| 63 |
@@ -176,7 +180,7 @@ |
| 64 |
|
| 65 |
for libdir in $(list_libdirs); do |
| 66 |
# Set libdir correctly to EROOT |
| 67 |
- [[ ${ROOT} != / ]] && libdir=${libdir#${ROOT}} |
| 68 |
+ [[ ${ROOT} != / ]] && libdir=${libdir#${EROOT}} |
| 69 |
|
| 70 |
# First make sure we have an opengl directory and this |
| 71 |
# is a real lib dir, not a symlink |
Archives