Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24470/10.3/unstable/main/finkinfo/languages
Modified Files:
ocaml.info ocaml.patch
Log Message:
1. Make ocaml configure look for X11.dylib. (imported from 10.4)
2. Pass Fink's CPPFLAGS and LDFLAGS in configure.
(surely link against libncurses in /sw/lib instead of /usr/lib)
Index: ocaml.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/ocaml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ocaml.patch 11 Oct 2005 06:33:18 -0000 1.1
+++ ocaml.patch 3 Jun 2008 14:07:31 -0000 1.2
@@ -1,3 +1,22 @@
+--- a/ocaml-3.09.3/configure Thu Mar 30 19:00:19 2006
++++ b/ocaml-3.09.3/configure Tue Jun 3 22:06:16 2008
+@@ -303,6 +303,8 @@
+
+ # Configure compiler to use in further tests
+
++bytecccompopts="$CPPFLAGS $bytecclinkopts"
++bytecclinkopts="$LDFLAGS $bytecclinkopts"
+ cc="$bytecc -O $bytecclinkopts"
+ export cc cclibs verbose
+
+@@ -1207,6 +1209,7 @@
+ if test -f $dir/libX11.a || \
+ test -f $dir/libX11.so || \
+ test -f $dir/libX11.dll.a || \
++ test -f $dir/libX11.dylib || \
+ test -f $dir/libX11.sa; then
+ if test $dir = /usr/lib; then
+ x11_link="-lX11"
diff -Nurd -x'*~' ocaml-3.08.0.orig/infoman/ocaml.info
ocaml-3.08.0/infoman/ocaml.info
--- ocaml-3.08.0.orig/infoman/ocaml.info 2004-07-13 07:27:03.000000000
-0400
+++ ocaml-3.08.0/infoman/ocaml.info 2005-10-11 01:48:20.000000000 -0400
Index: ocaml.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/languages/ocaml.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ocaml.info 12 Apr 2007 19:08:37 -0000 1.10
+++ ocaml.info 3 Jun 2008 14:07:31 -0000 1.11
@@ -1,6 +1,6 @@
Package: ocaml
Version: 3.09.3
-Revision: 2
+Revision: 3
Description: Latest implementation of Caml dialect of ML
BuildDepends: tcltk-dev, x11-dev, libncurses5
Depends: tcltk, x11, libncurses5-shlibs
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
