Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25849/10.4/unstable/main/finkinfo/languages
Modified Files:
ocaml.info ocaml.patch
Log Message:
1. Delete a patch for libX11.dylib, which is already added in upstream.
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.4/unstable/main/finkinfo/languages/ocaml.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ocaml.patch 24 Mar 2008 06:23:20 -0000 1.3
+++ ocaml.patch 3 Jun 2008 14:09:46 -0000 1.4
@@ -1,15 +1,15 @@
diff -u configure
--- a/ocaml-3.10.2/configure
+++ b/ocaml-3.10.2/configure
-@@ -1219,7 +1219,7 @@ for dir in \
- ; \
- do
- if test -f $dir/libX11.a || \
-- test -f $dir/libX11.so || \
-+ test -f $dir/libX11.dylib || \
- test -f $dir/libX11.dll.a || \
- test -f $dir/libX11.sa; then
- if test $dir = /usr/lib; then
+@@ -306,6 +306,8 @@
+
+ # Configure compiler to use in further tests
+
++bytecccompopts="$CPPFLAGS $bytecclinkopts"
++bytecclinkopts="$LDFLAGS $bytecclinkopts"
+ cc="$bytecc -O $bytecclinkopts"
+ export cc cclibs verbose
+
diff -u infoman/ocaml.info
--- a/infoman/ocaml.info
+++ b/infoman/ocaml.info
Index: ocaml.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/ocaml.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ocaml.info 24 Mar 2008 06:23:19 -0000 1.11
+++ ocaml.info 3 Jun 2008 14:09:46 -0000 1.12
@@ -1,6 +1,6 @@
Package: ocaml
Version: 3.10.2
-Revision: 1
+Revision: 2
Description: Latest implementation of Caml dialect of ML
BuildDepends: tcltk-dev, x11-dev, libncurses5 (>= 5.4-20041023-1006)
Depends: tcltk, x11, libncurses5-shlibs (>= 5.4-20041023-1006)
-------------------------------------------------------------------------
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
