[Vm-dev] [commit][2755] Update the unix launch scripts with yet another LD_LIBRARY_PATH entry.

commits at squeakvm.org commits at squeakvm.org
Wed Jul 24 17:31:50 UTC 2013


Revision: 2755
Author:   eliot
Date:     2013-07-24 10:31:47 -0700 (Wed, 24 Jul 2013)
Log Message:
-----------
Update the unix launch scripts with yet another LD_LIBRARY_PATH entry.

Modified Paths:
--------------
    branches/Cog/platforms/unix/config/bin.squeak.sh.in
    branches/Cog/platforms/unix/config/squeak.sh.in

Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in
===================================================================
--- branches/Cog/platforms/unix/config/bin.squeak.sh.in	2013-07-24 00:31:56 UTC (rev 2754)
+++ branches/Cog/platforms/unix/config/bin.squeak.sh.in	2013-07-24 17:31:47 UTC (rev 2755)
@@ -14,7 +14,7 @@
 # libc (e.g. through the FFI) then it must use the same version that the VM uses
 # and so it should take precedence over /lib libc.  This is done by setting
 # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> //'`"
+LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
 case "$LIBC_SO" in
 /lib/libc*)					SVMLLP="/lib:/usr/lib";;
 /lib32/libc*)				SVMLLP="/lib32:/usr/lib32";;
@@ -22,10 +22,12 @@
 /lib/tls/libc*)				SVMLLP="/lib/tls:/lib:/usr/lib/tls:/usr/lib";;
 /lib/i386-linux-gnu/libc*)	\
 	SVMLLP="/lib/i386-linux-gnu:/lib:/usr/lib/i386-linux-gnu:/usr/lib";;
+/lib/i386-linux-gnu/i686/cmov/libc*)	\
+	SVMLLP="/lib/i386-linux-gnu/i686/cmov:/lib:/usr/lib/i386-linux-gnu/i686/cmov:/usr/lib";;
+/lib/386-linux-gnu/i686/cmov/libc*)	\
+	SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";;
 /lib/tls/i686/cmov/libc*)	\
 	SVMLLP="/lib/tls/i686/cmov:/lib:/usr/lib/tls/i686/cmov:/usr/lib";;
-/lib/386-linux-gnu/i686/cmov/libc*)	\
-	SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";;
 /lib/tls/i686/nosegneg/libc*)	\
 	SVMLLP="/lib/i686/nosegneg/tls:/lib:/usr/lib/i686/nosegneg/tls:/usr/lib";;
 "")	case `/bin/uname -m || /usr/bin/uname -m` in

Modified: branches/Cog/platforms/unix/config/squeak.sh.in
===================================================================
--- branches/Cog/platforms/unix/config/squeak.sh.in	2013-07-24 00:31:56 UTC (rev 2754)
+++ branches/Cog/platforms/unix/config/squeak.sh.in	2013-07-24 17:31:47 UTC (rev 2755)
@@ -14,7 +14,7 @@
 # libc (e.g. through the FFI) then it must use the same version that the VM uses
 # and so it should take precedence over /lib libc.  This is done by setting
 # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
-LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> //'`"
+LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> \([^ ]*\).*/\1/'`"
 case "$LIBC_SO" in
 /lib/libc*)					SVMLLP="/lib:/usr/lib";;
 /lib32/libc*)				SVMLLP="/lib32:/usr/lib32";;
@@ -22,10 +22,12 @@
 /lib/tls/libc*)				SVMLLP="/lib/tls:/lib:/usr/lib/tls:/usr/lib";;
 /lib/i386-linux-gnu/libc*)	\
 	SVMLLP="/lib/i386-linux-gnu:/lib:/usr/lib/i386-linux-gnu:/usr/lib";;
+/lib/i386-linux-gnu/i686/cmov/libc*)	\
+	SVMLLP="/lib/i386-linux-gnu/i686/cmov:/lib:/usr/lib/i386-linux-gnu/i686/cmov:/usr/lib";;
+/lib/386-linux-gnu/i686/cmov/libc*)	\
+	SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";;
 /lib/tls/i686/cmov/libc*)	\
 	SVMLLP="/lib/tls/i686/cmov:/lib:/usr/lib/tls/i686/cmov:/usr/lib";;
-/lib/386-linux-gnu/i686/cmov/libc*)	\
-	SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";;
 /lib/tls/i686/nosegneg/libc*)	\
 	SVMLLP="/lib/i686/nosegneg/tls:/lib:/usr/lib/i686/nosegneg/tls:/usr/lib";;
 "")	case `/bin/uname -m || /usr/bin/uname -m` in



More information about the Vm-dev mailing list