Update of /cvsroot/fink/experimental/asari
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv2259
Modified Files:
openoffice.org.patch
Log Message:
Avoid adding /sw/lib, /usr/lib or /usr/X11R6/lib into DYLD_LIBRARY_PATH on
checking libraries, which confuses libjpeg and libJPEG etc.
Index: openoffice.org.patch
===================================================================
RCS file: /cvsroot/fink/experimental/asari/openoffice.org.patch,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- openoffice.org.patch 3 May 2007 04:56:10 -0000 1.23
+++ openoffice.org.patch 3 May 2007 09:59:29 -0000 1.24
@@ -113,11 +113,11 @@
.ENDIF
.IF "$(COMNAME)"=="sunpro5"
-### Avoid adding /sw/lib into DYLD_LIBRARY_PATH on checking libraries,
-### which confises "libjpeg" and "libJPEG" etc.
+### Avoid adding /sw/lib, /usr/lib or /usr/X11R6/lib into DYLD_LIBRARY_PATH
+### on checking libraries, which confuses "libjpeg" and "libJPEG" etc.
--- solenv/bin/checkdll.sh.orig 2007-05-02 03:38:03.000000000 +0900
+++ solenv/bin/checkdll.sh 2007-05-02 12:14:15.000000000 +0900
-@@ -45,15 +45,21 @@
+@@ -45,15 +45,23 @@
checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll"
if [ -x $checkdll ]; then
@@ -133,6 +133,8 @@
- *) libpath=$option;;
+ case $uname_s-$option in
+ Darwin-${FINK_PREFIX-/sw}/lib) skip=true;;
++ Darwin-/usr/lib) skip=true;;
++ Darwin-/usr/X11R6/lib) skip=true;;
+ *) skip=false;;
+ esac
+ case "$skip-${libpath+X}" in
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
