Update of /cvsroot/fink/base-files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31191
Modified Files:
ChangeLog VERSION init.csh.in init.sh.in
Log Message:
* init.sh.in, init.csh.in: Only set DYLD_FALLBACK_LIBRARY_PATH on
10.4.{x|x<3}.
* VERSION: Bumped base-files version to 1.9.8
Index: init.sh.in
===================================================================
RCS file: /cvsroot/fink/base-files/init.sh.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- init.sh.in 1 Jul 2005 15:12:03 -0000 1.19
+++ init.sh.in 9 Nov 2005 20:14:49 -0000 1.20
@@ -51,6 +51,7 @@
export PATH
osMajorVer=`uname -r | cut -d. -f1`
+osMinorVer=`uname -r | cut -d. -f2`
if [ -z "$MANPATH" ]; then
if [ $osMajorVer -gt 7 ]; then
MANPATH=`/usr/bin/manpath`
@@ -97,12 +98,12 @@
export MANPATH
fi
-# On Mac OS X 10.4 there is a dyld bug (rdar://problem/4139432)
+# On Mac OS X 10.4.{x|x<3} there is a dyld bug (rdar://problem/4139432)
# where a library will not load if a library with a matching basename
# is already loaded from one of the system paths,
# the workaround is to set DYLD_FALLBACK_LIBRARY_PATH to :
if [ -z "$DYLD_FALLBACK_LIBRARY_PATH" ]; then
- if [ $osMajorVer -gt 7 ]; then
+ if [ $osMajorVer -eq 8 -a $osMinorVer -lt 3 ]; then
DYLD_FALLBACK_LIBRARY_PATH=:
export DYLD_FALLBACK_LIBRARY_PATH
fi
Index: VERSION
===================================================================
RCS file: /cvsroot/fink/base-files/VERSION,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- VERSION 5 Aug 2005 14:51:37 -0000 1.20
+++ VERSION 9 Nov 2005 20:14:49 -0000 1.21
@@ -1 +1 @@
-1.9.7.cvs
+1.9.8.cvs
Index: init.csh.in
===================================================================
RCS file: /cvsroot/fink/base-files/init.csh.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- init.csh.in 1 Jul 2005 15:12:03 -0000 1.18
+++ init.csh.in 9 Nov 2005 20:14:49 -0000 1.19
@@ -39,6 +39,7 @@
endif
set osMajorVersion = `uname -r | cut -d. -f1`
+set osMinorVersion = `uname -r | cut -d. -f2`
if ( ! $?MANPATH ) then
if ( $osMajorVersion > 7) then
setenv MANPATH `/usr/bin/manpath`
@@ -79,12 +80,12 @@
append_path MANPATH /usr/X11R6/man
endif
-# On Mac OS X 10.4 there is a dyld bug (rdar://problem/4139432)
+# On Mac OS X 10.4.{x|x<3} there is a dyld bug (rdar://problem/4139432)
# where a library will not load if a library with a matching basename
# is already loaded from one of the system paths,
# the workaround is to set DYLD_FALLBACK_LIBRARY_PATH to :
if ( ! $?DYLD_FALLBACK_LIBRARY_PATH ) then
- if ( $osMajorVersion > 7) then
+ if ( $osMajorVersion == 8 && $osMinorVersion < 3 ) then
setenv DYLD_FALLBACK_LIBRARY_PATH :
endif
endif
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/base-files/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ChangeLog 5 Aug 2005 14:51:37 -0000 1.42
+++ ChangeLog 9 Nov 2005 20:14:49 -0000 1.43
@@ -1,3 +1,9 @@
+2005-11-09 Matthew Sachs <[EMAIL PROTECTED]>
+
+ * init.sh.in, init.csh.in: Only set DYLD_FALLBACK_LIBRARY_PATH
+ on 10.4.{x|x<3}.
+ * VERSION: Bumped base-files version to 1.9.8
+
2005-08-05 Dave Morrison <[EMAIL PROTECTED]>
* VERSION: Bumped base-files version to 1.9.7
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
