Bug 259945 - Mozilla should not use LD_LIBRARY_PATH on solaris; use libgkgfx.so instead of libmozjs.so; r=wtc sr=neil
authorBoying Lu <brian.lu@sun.com>
Fri, 21 Nov 2008 20:24:08 +0100
changeset 21864 cfb281c007d0dee13a2fc888bfec254348dc3b30
parent 21863 2fa341c1330ba244db8cce980468c12e498bed4b
child 21865 1c0893f3e640df5fb7ebe96d26278bc2a4e0463a
push idunknown
push userunknown
push dateunknown
reviewerswtc, neil
bugs259945
milestone1.9.1b2pre
Bug 259945 - Mozilla should not use LD_LIBRARY_PATH on solaris; use libgkgfx.so instead of libmozjs.so; r=wtc sr=neil (to CLOSED TREE)
build/unix/run-mozilla.sh
--- a/build/unix/run-mozilla.sh
+++ b/build/unix/run-mozilla.sh
@@ -335,28 +335,28 @@ fi
 ##
 ## Set LD_LIBRARY_PATH
 ##
 ## On Solaris we use $ORIGIN (set in RUNPATH) instead of LD_LIBRARY_PATH 
 ## to locate shared libraries. 
 ##
 ## When a shared library is a symbolic link, $ORIGIN will be replaced with
 ## the real path (i.e., what the symbolic link points to) by the runtime
-## linker.  For example, if dist/bin/libmozjs.so is a symbolic link to
-## js/src/libmozjs.so, $ORIGIN will be "js/src" instead of "dist/bin".
-## So the runtime linker will use "js/src" NOT "dist/bin" to locate the
-## other shared libraries that libmozjs.so depends on.  This only happens
+## linker.  For example, if dist/bin/libgkgfx.so is a symbolic link to
+## gfx/src/libgkgfx.so, $ORIGIN will be "gfx/src" instead of "dist/bin".
+## So the runtime linker will use "gfx/src" NOT "dist/bin" to locate the
+## other shared libraries that libgkgfx.so depends on.  This only happens
 ## when a user (developer) tries to start firefox, thunderbird, or seamonkey
 ## under dist/bin. To solve the problem, we should rely on LD_LIBRARY_PATH
 ## to locate shared libraries.
 ##
 ## Note: 
-##  We choose libmozjs.so as a representative shared library. If it is 
+##  We choose libgkgfx.so as a representative shared library. If it is 
 ##  a symbolic link, all other shared libraries are symbolic links also.
-if [ `uname -s` != "SunOS" -o -h "$MOZ_DIST_BIN/libmozjs.so" ]
+if [ `uname -s` != "SunOS" -o -h "$MOZ_DIST_BIN/libgkgfx.so" ]
 then
 	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
 fi 
 
 if [ -n "$LD_LIBRARYN32_PATH" ]
 then
 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
 fi