summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-09-12 15:10:00 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-09-12 15:10:00 +0000
commit4f8d66b1a4bcdfcc432c696e7137a39cecac071d (patch)
tree3c75475dc208a2313d3faf4d355a734b9dccc539
parentAlphabetize the PPC machines. Add iMac G5 to list. (diff)
downloadlivecd-tools-4f8d66b1a4bcdfcc432c696e7137a39cecac071d.tar.gz
livecd-tools-4f8d66b1a4bcdfcc432c696e7137a39cecac071d.tar.bz2
livecd-tools-4f8d66b1a4bcdfcc432c696e7137a39cecac071d.zip
Update openglify to support 32-bit drivers on a 64-bit system.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/livecd-tools/trunk@121 7bf51bff-881f-0410-a643-fba68b97345e
-rwxr-xr-xopenglify44
1 files changed, 35 insertions, 9 deletions
diff --git a/openglify b/openglify
index d4df2a7..e8041b2 100755
--- a/openglify
+++ b/openglify
@@ -1,33 +1,59 @@
#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/livecd-tools/openglify,v 1.7 2006/07/20 21:34:03 wolf31o2 Exp $
-#This script is designed to tweak the system for opengl-update
-#set up our flexible opengl stuff:
+# This script is designed to tweak the system for eselect-opengl/opengl-update.
-#move symlinks to a malleable /etc/opengl directory.
+# move symlinks to a malleable /etc/opengl directory.
install -d test/lib/modules/extensions
-rm -f /usr/lib/libGL{,core}.{a,so}* > /dev/null 2>&1
-rm -f /usr/lib/modules/extensions/libglx* > /dev/null 2>&1
-rm -f /usr/lib/xorg/modules/extensions/libglx* > /dev/null 2>&1
+# First, we remove all of the symlinks, so we can point them to our own
+# /etc/opengl directory
+rm -f /usr/lib*/libGL{,core}.{a,so}* > /dev/null 2>&1
+rm -f /usr/lib*/modules/extensions/libglx* > /dev/null 2>&1
+rm -f /usr/lib*/xorg/modules/extensions/libglx* > /dev/null 2>&1
+# We start with the "default" libdir of /usr/lib
ln -sf /etc/opengl/lib/libGL.so /usr/lib/libGL.so
ln -sf /etc/opengl/lib/libGL.so.1 /usr/lib/libGL.so.1
ln -sf /etc/opengl/lib/libGLcore.so /usr/lib/libGLcore.so
ln -sf /etc/opengl/lib/libGLcore.so.1 /usr/lib/libGLcore.so.1
+ln -sf /etc/opengl/lib/libGL.la /usr/lib/libGL.la
+
+# We then check for /usr/lib32
+if [ -d /usr/lib32 ]
+then
+ ln -sf /etc/opengl/lib32/libGL.so /usr/lib32/libGL.so
+ ln -sf /etc/opengl/lib32/libGL.so.1 /usr/lib32/libGL.so.1
+ ln -sf /etc/opengl/lib32/libGLcore.so /usr/lib32/libGLcore.so
+ ln -sf /etc/opengl/lib32/libGLcore.so.1 /usr/lib32/libGLcore.so.1
+ ln -sf /etc/opengl/lib32/libGL.la /usr/lib32/libGL.la
+fi
+
+# We create symlinks fo the libglx.so and libglx.a
if [ -d /usr/lib/modules/extensions ]
then
ln -sf /etc/opengl/lib/modules/extensions/libglx.so \
/usr/lib/modules/extensions/libglx.so
ln -sf /etc/opengl/lib/modules/extensions/libglx.a \
/usr/lib/modules/extensions/libglx.a
+ if [ -d /usr/lib32 ]
+ then
+ ln -sf /etc/opengl/lib32/modules/extensions/libglx.so \
+ /usr/lib32/modules/extensions/libglx.so
+ ln -sf /etc/opengl/lib32/modules/extensions/libglx.a \
+ /usr/lib32/modules/extensions/libglx.a
+ fi
elif [ -d /usr/lib/xorg/modules/extensions ]
then
ln -sf /etc/opengl/lib/modules/extensions/libglx.so \
/usr/lib/xorg/modules/extensions/libglx.so
ln -sf /etc/opengl/lib/modules/extensions/libglx.a \
/usr/lib/xorg/modules/extensions/libglx.a
+ if [ -d /usr/lib32 ]
+ then
+ ln -sf /etc/opengl/lib32/modules/extensions/libglx.so \
+ /usr/lib32/xorg/modules/extensions/libglx.so
+ ln -sf /etc/opengl/lib32/modules/extensions/libglx.a \
+ /usr/lib32/xorg/modules/extensions/libglx.a
+ fi
fi