X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml.git;a=blobdiff_plain;f=ocaml-CFLAGS.patch;h=5c7e90c6eeb03ae3316b75e52eeca2ebcf817a96;hp=d787a66186aee0fd064c653a7a50bf1c73040818;hb=023cf8907fbea3dffe7d40574c0691b4b600e210;hpb=4cfe9969bf4567b95c91fa966153155b4c18fa91

diff --git a/ocaml-CFLAGS.patch b/ocaml-CFLAGS.patch
index d787a66..5c7e90c 100644
--- a/ocaml-CFLAGS.patch
+++ b/ocaml-CFLAGS.patch
@@ -1,4 +1,4 @@
-# allow pass CFLAGS, replace -O, -pg,-DPROFILING with $(CFAGS)
+# allow pass CFLAGS, replace -O, -pg,-DPROFILING with $(CFLAGS)
 Makefiles=$(find . -type f -name Makefile\*)
 %{__sed} -i -e 's@^CFLAGS[ \t]*=@override CFLAGS += @' $Makefiles
 %{__sed} -i -e 's@\(^override CFLAGS += .*\)-O \(.*\)@\1\2@' $Makefiles
@@ -6,24 +6,24 @@ Makefiles=$(find . -type f -name Makefile\*)
 %{__sed} -i -e 's@-pg -O -DPROFILING@ $(CFLAGS) @' asmrun/Makefile
 %{__sed} -i -e 's@-O@$(CFLAGS)@' otherlibs/systhreads/Makefile
 
-diff -Nur b.ocaml-3.08.4/asmrun/Makefile n.ocaml-3.08.4/asmrun/Makefile
---- b.ocaml-3.08.4/asmrun/Makefile	2004-05-09 17:19:16.000000000 +0200
-+++ n.ocaml-3.08.4/asmrun/Makefile	2005-11-04 21:26:14.810315536 +0100
+diff -ur ocaml-3.11.0/asmrun/Makefile ocaml-3.11.0.CFLAGS/asmrun/Makefile
+--- ocaml-3.11.0/asmrun/Makefile	2007-11-15 14:21:15.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/asmrun/Makefile	2009-02-16 12:18:06.599221049 +0100
 @@ -18,9 +18,9 @@
  CC=$(NATIVECC)
  FLAGS=-I../byterun -DCAML_NAME_SPACE -DNATIVE_CODE \
-       -DTARGET_$(ARCH) -DSYS_$(SYSTEM) 
+       -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(IFLEXDIR)
 -CFLAGS=$(FLAGS) -O $(NATIVECCCOMPOPTS)
 +override CFLAGS += $(FLAGS) $(NATIVECCCOMPOPTS)
  DFLAGS=$(FLAGS) -g -DDEBUG $(NATIVECCCOMPOPTS)
 -PFLAGS=$(FLAGS) -pg -O -DPROFILING $(NATIVECCPROFOPTS)
 +PFLAGS=$(FLAGS)  $(CFLAGS)  $(NATIVECCPROFOPTS)
  
- COBJS=startup.o main.o fail.o roots.o globroots.o signals.o \
+ COBJS=startup.o main.o fail.o roots.o globroots.o signals.o signals_asm.o \
    misc.o freelist.o major_gc.o minor_gc.o memory.o alloc.o compare.o ints.o \
-diff -Nur b.ocaml-3.08.4/asmrun/Makefile.nt n.ocaml-3.08.4/asmrun/Makefile.nt
---- b.ocaml-3.08.4/asmrun/Makefile.nt	2002-06-18 18:17:34.000000000 +0200
-+++ n.ocaml-3.08.4/asmrun/Makefile.nt	2005-11-04 21:26:14.407376792 +0100
+diff -ur ocaml-3.11.0/asmrun/Makefile.nt ocaml-3.11.0.CFLAGS/asmrun/Makefile.nt
+--- ocaml-3.11.0/asmrun/Makefile.nt	2007-11-15 14:21:15.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/asmrun/Makefile.nt	2009-02-16 12:18:01.212550815 +0100
 @@ -16,7 +16,7 @@
  include ../config/Makefile
  
@@ -31,235 +31,113 @@ diff -Nur b.ocaml-3.08.4/asmrun/Makefile.nt n.ocaml-3.08.4/asmrun/Makefile.nt
 -CFLAGS=-I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(NATIVECCCOMPOPTS)
 +override CFLAGS += -I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(NATIVECCCOMPOPTS)
  
- COBJS=startup.$(O) main.$(O) fail.$(O) roots.$(O) signals.$(O) \
+ COBJS=startup.$(O) main.$(O) fail.$(O) roots.$(O) signals.$(O) signals_asm.$(O) \
    misc.$(O) freelist.$(O) major_gc.$(O) minor_gc.$(O) memory.$(O) alloc.$(O) \
-diff -Nur b.ocaml-3.08.4/byterun/Makefile n.ocaml-3.08.4/byterun/Makefile
---- b.ocaml-3.08.4/byterun/Makefile	2004-08-20 17:11:36.000000000 +0200
-+++ n.ocaml-3.08.4/byterun/Makefile	2005-11-04 21:26:14.408376640 +0100
-@@ -16,7 +16,7 @@
- include ../config/Makefile
+--- ocaml-3.12.0/byterun/Makefile	2008-11-08 17:29:02.000000000 +0100
++++ ocaml-3.12.0.CFLAGS/byterun/Makefile	2009-02-16 12:18:01.212550815 +0100
+@@ -15,7 +15,7 @@
  
- CC=$(BYTECC)
--CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS)
-+override CFLAGS += -DCAML_NAME_SPACE $(BYTECCCOMPOPTS)
- DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS)
+ include Makefile.common
  
- OBJS=interp.o misc.o stacks.o fix_code.o startup.o main.o \
-diff -Nur b.ocaml-3.08.4/byterun/Makefile.nt n.ocaml-3.08.4/byterun/Makefile.nt
---- b.ocaml-3.08.4/byterun/Makefile.nt	2004-08-20 17:11:36.000000000 +0200
-+++ n.ocaml-3.08.4/byterun/Makefile.nt	2005-11-04 21:26:14.410376336 +0100
-@@ -16,7 +16,7 @@
- include ../config/Makefile
+-CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR)
++override CFLAGS += -DCAML_NAME_SPACE $(BYTECCCOMPOPTS) $(IFLEXDIR)
+ DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS) $(IFLEXDIR)
  
- CC=$(BYTECC)
--CFLAGS=-DIN_OCAMLRUN -DOCAML_STDLIB_DIR='"$(LIBDIR)"'
-+override CFLAGS += -DIN_OCAMLRUN -DOCAML_STDLIB_DIR='"$(LIBDIR)"'
+ OBJS=$(COMMONOBJS) unix.o main.o
+diff -ur ocaml-3.11.0/byterun/Makefile.nt ocaml-3.11.0.CFLAGS/byterun/Makefile.nt
+--- ocaml-3.11.0/byterun/Makefile.nt	2008-11-26 14:26:53.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/byterun/Makefile.nt	2009-02-16 12:18:01.215883365 +0100
+@@ -15,7 +15,7 @@
  
- COMMONOBJS=interp.o misc.o stacks.o fix_code.o startup.o \
-   fail.o signals.o freelist.o major_gc.o minor_gc.o \
-diff -Nur b.ocaml-3.08.4/otherlibs/bigarray/Makefile n.ocaml-3.08.4/otherlibs/bigarray/Makefile
---- b.ocaml-3.08.4/otherlibs/bigarray/Makefile	2002-06-27 13:36:00.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/bigarray/Makefile	2005-11-04 21:26:14.722328912 +0100
-@@ -16,7 +16,7 @@
- include ../../config/Makefile
+ include Makefile.common
  
- CC=$(BYTECC)
--CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- CAMLC=../../ocamlcomp.sh -I ../unix
- CAMLOPT=../../ocamlcompopt.sh -I ../unix
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-diff -Nur b.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt n.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt	2003-07-08 16:24:07.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/bigarray/Makefile.nt	2005-11-04 21:26:14.723328760 +0100
-@@ -16,7 +16,7 @@
- include ../../config/Makefile
+-CFLAGS=-DOCAML_STDLIB_DIR='"$(LIBDIR)"' $(IFLEXDIR)
++override CFLAGS += -DOCAML_STDLIB_DIR='"$(LIBDIR)"' $(IFLEXDIR)
  
- CC=$(BYTECC)
--CFLAGS=-I../../byterun -I../win32unix -DIN_OCAML_BIGARRAY
-+override CFLAGS += -I../../byterun -I../win32unix -DIN_OCAML_BIGARRAY
- CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib -I ../win32unix
- CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -I ../win32unix
+ DBGO=d.$(O)
+ OBJS=$(COMMONOBJS:.o=.$(O)) win32.$(O) main.$(O)
+diff -ur ocaml-3.11.0/otherlibs/Makefile ocaml-3.11.0.CFLAGS/otherlibs/Makefile
+--- ocaml-3.11.0/otherlibs/Makefile	2007-11-08 10:17:47.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/otherlibs/Makefile	2009-02-16 12:18:01.282552384 +0100
+@@ -17,7 +17,7 @@
  
-diff -Nur b.ocaml-3.08.4/otherlibs/dbm/Makefile n.ocaml-3.08.4/otherlibs/dbm/Makefile
---- b.ocaml-3.08.4/otherlibs/dbm/Makefile	2002-06-27 13:36:01.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/dbm/Makefile	2005-11-04 21:26:14.724328608 +0100
-@@ -24,7 +24,7 @@
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
- COMPFLAGS=-warn-error A
+ CAMLC=$(ROOTDIR)/ocamlcomp.sh
+ CAMLOPT=$(ROOTDIR)/ocamlcompopt.sh
+-CFLAGS=-I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
++override CFLAGS += -I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
  
--CFLAGS=$(DBM_INCLUDES) -I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+override CFLAGS += $(DBM_INCLUDES) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- COBJS=cldbm.o
+ include ../Makefile.shared
+ # Note .. is the current directory (this makefile is included from
+diff -ur ocaml-3.11.0/otherlibs/Makefile.nt ocaml-3.11.0.CFLAGS/otherlibs/Makefile.nt
+--- ocaml-3.11.0/otherlibs/Makefile.nt	2007-11-08 10:17:48.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/otherlibs/Makefile.nt	2009-02-16 12:18:01.282552384 +0100
+@@ -17,7 +17,7 @@
  
- all: libmldbm.a dbm.cmi dbm.cma
-diff -Nur b.ocaml-3.08.4/otherlibs/graph/Makefile n.ocaml-3.08.4/otherlibs/graph/Makefile
---- b.ocaml-3.08.4/otherlibs/graph/Makefile	2005-06-22 17:47:33.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/graph/Makefile	2005-11-04 21:26:14.727328152 +0100
-@@ -18,7 +18,7 @@
- include ../../config/Makefile
+ CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib -w s
+ CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib -w s
+-CFLAGS=-I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
++override CFLAGS += -I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
  
- CC=$(BYTECC)
--CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+override CFLAGS += -I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- CAMLC=../../ocamlcomp.sh
- CAMLOPT=../../ocamlcompopt.sh
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-diff -Nur b.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt n.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt	2005-06-27 09:01:40.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/labltk/browser/Makefile.nt	2005-11-04 21:26:14.730327696 +0100
-@@ -4,7 +4,7 @@
+ include ../Makefile.shared
+ # Note .. is the current directory (this makefile is included from
+diff -ur ocaml-3.11.0/otherlibs/labltk/browser/Makefile.nt ocaml-3.11.0.CFLAGS/otherlibs/labltk/browser/Makefile.nt
+--- ocaml-3.11.0/otherlibs/labltk/browser/Makefile.nt	2008-12-03 14:03:18.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/otherlibs/labltk/browser/Makefile.nt	2009-02-16 12:18:01.272552219 +0100
+@@ -1,6 +1,6 @@
  OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/str -I $(OTHERS)/systhreads
- OCAMLTOPLIB=-I $(TOPDIR)/parsing -I $(TOPDIR)/utils -I $(TOPDIR)/typing
- INCLUDES=$(OTHERSLIB) $(LABLTKLIB) $(OCAMLTOPLIB)
+ 
 -CCFLAGS=-I../../../byterun $(TK_DEFS)
 +override CCFLAGS += -I../../../byterun $(TK_DEFS) $(CFLAGS)
  
- ifeq ($(CCOMPTYPE),cc)
- WINDOWS_APP=-cclib "-Wl,--subsystem,windows"
-diff -Nur b.ocaml-3.08.4/otherlibs/labltk/support/Makefile n.ocaml-3.08.4/otherlibs/labltk/support/Makefile
---- b.ocaml-3.08.4/otherlibs/labltk/support/Makefile	2002-06-27 13:36:01.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/labltk/support/Makefile	2005-11-04 21:26:14.772321312 +0100
-@@ -11,7 +11,7 @@
- COBJS=cltkCaml.o cltkUtf.o cltkEval.o cltkEvent.o cltkFile.o cltkMain.o \
-       cltkMisc.o cltkTimer.o cltkVar.o cltkWait.o cltkImg.o
- 
--CCFLAGS=-I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS)
-+override CCFLAGS += -I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS) $(CFLAGS)
- 
- COMPFLAGS=-I $(OTHERS)/unix
- 
-diff -Nur b.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt n.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt	2003-07-10 11:18:02.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/labltk/support/Makefile.nt	2005-11-04 21:26:14.774321008 +0100
-@@ -13,7 +13,7 @@
- DCOBJS=$(COBJS:.o=.$(DO))
- SCOBJS=$(COBJS:.o=.$(SO))
- 
--CCFLAGS=-I../../../byterun -I../../win32unix $(TK_DEFS) -DIN_CAMLTKSUPPORT
-+override CCFLAGS += -I../../../byterun -I../../win32unix $(TK_DEFS) -DIN_CAMLTKSUPPORT $(CFLAGS)
- 
- COMPFLAGS=-I $(OTHERS)/win32unix
- 
-diff -Nur b.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile n.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile
---- b.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile	2004-05-08 18:04:39.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile	2005-11-04 21:26:14.776320704 +0100
-@@ -1,7 +1,7 @@
  include ../support/Makefile.common
  
- COMPFLAGS=-I ../../../byterun -I ../support -I ../camltk -I ../../unix
--CCFLAGS=-I../../../byterun -I../support $(TK_DEFS) $(SHAREDCCCOMPOPTS)
-+override CCFLAGS += -I../../../byterun -I../support $(TK_DEFS) $(SHAREDCCCOMPOPTS) $(CFLAGS)
+diff -ur ocaml-3.11.0/otherlibs/labltk/support/Makefile ocaml-3.11.0.CFLAGS/otherlibs/labltk/support/Makefile
+--- ocaml-3.11.0/otherlibs/labltk/support/Makefile	2008-04-22 09:38:07.000000000 +0200
++++ ocaml-3.11.0.CFLAGS/otherlibs/labltk/support/Makefile	2009-02-16 12:18:01.282552384 +0100
+@@ -12,7 +12,7 @@
+       cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \
+       cltkVar.$(O) cltkWait.$(O) cltkImg.$(O)
  
- all: tkanim.cma libtkanim.a
- opt: tkanim.cmxa libtkanim.a
-diff -Nur b.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile.nt n.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile.nt	2002-06-27 13:36:01.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/labltk/tkanim/Makefile.nt	2005-11-04 21:26:14.777320552 +0100
-@@ -1,6 +1,6 @@
- include ../support/Makefile.common.nt
- 
--CCFLAGS=-I../support -I../../../byterun $(TK_DEFS)
-+override CCFLAGS += -I../support -I../../../byterun $(TK_DEFS) $(CFLAGS)
- 
- COMPFLAGS=-I $(OTHERS)/win32unix -I ../support -I ../camltk
- 
-diff -Nur b.ocaml-3.08.4/otherlibs/num/Makefile n.ocaml-3.08.4/otherlibs/num/Makefile
---- b.ocaml-3.08.4/otherlibs/num/Makefile	2003-10-24 11:17:31.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/num/Makefile	2005-11-04 21:26:14.778320400 +0100
-@@ -19,7 +19,7 @@
- 
- # Compilation options
- CC=$(BYTECC)
--CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
-+override CFLAGS += -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
-           -DBNG_ARCH_$(BNG_ARCH) -DBNG_ASM_LEVEL=$(BNG_ASM_LEVEL)
- CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../boot -w s
- CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -w s
-diff -Nur b.ocaml-3.08.4/otherlibs/num/Makefile.nt n.ocaml-3.08.4/otherlibs/num/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/num/Makefile.nt	2004-11-29 09:50:23.000000000 +0100
-+++ n.ocaml-3.08.4/otherlibs/num/Makefile.nt	2005-11-04 21:26:14.779320248 +0100
-@@ -19,7 +19,7 @@
- 
- # Compilation options
- CC=$(BYTECC)
--CFLAGS=-I../../byterun \
-+override CFLAGS += -I../../byterun \
-           -DBNG_ARCH_$(BNG_ARCH) -DBNG_ASM_LEVEL=$(BNG_ASM_LEVEL)
- CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../boot -w s
- CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -w s
-diff -Nur b.ocaml-3.08.4/otherlibs/num/test/Makefile n.ocaml-3.08.4/otherlibs/num/test/Makefile
---- b.ocaml-3.08.4/otherlibs/num/test/Makefile	2003-10-24 11:17:46.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/num/test/Makefile	2005-11-04 21:26:14.781319944 +0100
-@@ -18,7 +18,7 @@
- CAMLC=../../../boot/ocamlrun ../../../ocamlc -I ../../../stdlib
- CAMLOPT=../../../boot/ocamlrun ../../../ocamlopt -I ../../../stdlib
- CC=$(BYTECC)
--CFLAGS=-I.. -I../../../byterun $(BYTECCCOMPOPTS)
-+override CFLAGS += -I.. -I../../../byterun $(BYTECCCOMPOPTS)
- 
- test: test.byt test.opt
- 	if $(SUPPORTS_SHARED_LIBRARIES); then ../../../byterun/ocamlrun -I .. ./test.byt; else ./test.byt; fi
-diff -Nur b.ocaml-3.08.4/otherlibs/num/test/Makefile.nt n.ocaml-3.08.4/otherlibs/num/test/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/num/test/Makefile.nt	2004-04-01 15:10:12.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/num/test/Makefile.nt	2005-11-04 21:26:14.782319792 +0100
-@@ -18,7 +18,7 @@
- CAMLC=../../../boot/ocamlrun ../../../ocamlc -I ../../../stdlib -I ..
- CAMLOPT=../../../boot/ocamlrun ../../../ocamlopt -I ../../../stdlib -I ..
- CC=$(BYTECC)
--CFLAGS=-I.. $(BYTECCCOMPOPTS)
-+override CFLAGS += -I.. $(BYTECCCOMPOPTS)
- 
- test: test.byt test.opt
- 	../../../byterun/ocamlrun -I .. ./test.byt
-diff -Nur b.ocaml-3.08.4/otherlibs/str/Makefile n.ocaml-3.08.4/otherlibs/str/Makefile
---- b.ocaml-3.08.4/otherlibs/str/Makefile	2002-12-09 15:05:18.000000000 +0100
-+++ n.ocaml-3.08.4/otherlibs/str/Makefile	2005-11-04 21:26:14.784319488 +0100
-@@ -19,7 +19,7 @@
- 
- # Compilation options
- CC=$(BYTECC)
--CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- CAMLC=../../ocamlcomp.sh
- CAMLOPT=../../ocamlcompopt.sh
- COMPFLAGS=-warn-error A
-diff -Nur b.ocaml-3.08.4/otherlibs/str/Makefile.nt n.ocaml-3.08.4/otherlibs/str/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/str/Makefile.nt	2002-12-09 15:05:18.000000000 +0100
-+++ n.ocaml-3.08.4/otherlibs/str/Makefile.nt	2005-11-04 21:26:14.786319184 +0100
-@@ -19,7 +19,7 @@
+-CCFLAGS=-I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS)
++override CCFLAGS += -I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS) $(CFLAGS)
  
- # Compilation options
- CC=$(BYTECC)
--CFLAGS=-I../../byterun
-+override CFLAGS += -I../../byterun
- CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../boot
- CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
- DCOBJS=strstubs.$(DO)
-diff -Nur b.ocaml-3.08.4/otherlibs/systhreads/Makefile n.ocaml-3.08.4/otherlibs/systhreads/Makefile
---- b.ocaml-3.08.4/otherlibs/systhreads/Makefile	2003-08-21 15:52:07.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/systhreads/Makefile	2005-11-04 21:26:14.815314776 +0100
-@@ -35,7 +35,7 @@
+ COMPFLAGS=-I $(OTHERS)/win32unix -I $(OTHERS)/unix
+ THFLAGS=-I $(OTHERS)/systhreads -I $(OTHERS)/threads
+--- ocaml-3.12.0/otherlibs/systhreads/Makefile.orig	2010-04-27 09:55:08.000000000 +0200
++++ ocaml-3.12.0/otherlibs/systhreads/Makefile	2011-03-12 10:40:54.827415456 +0100
+@@ -33,7 +33,7 @@
  	$(MKLIB) -o threads $(BYTECODE_C_OBJS)
  
- posix_b.o: posix.c
+ st_stubs_b.o: st_stubs.c st_posix.h
 -	$(BYTECC) -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
 +	$(BYTECC) $(CFLAGS) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
- 	   -c posix.c
- 	mv posix.o posix_b.o
+ 	   -c st_stubs.c
+ 	mv st_stubs.o st_stubs_b.o
  
-@@ -45,7 +45,7 @@
+@@ -43,7 +43,7 @@
  	$(AR) rc libthreadsnat.a $(NATIVECODE_C_OBJS)
  
- posix_n.o: posix.c
--	$(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
-+	$(NATIVECC) $(CFLAGS) -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
- 	mv posix.o posix_n.o
+ st_stubs_n.o: st_stubs.c st_posix.h
+-	$(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c st_stubs.c
++	$(NATIVECC) $(CFLAGS) -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c st_stubs.c
+ 	mv st_stubs.o st_stubs_n.o
  
  threads.cma: $(THREAD_OBJS)
-diff -Nur b.ocaml-3.08.4/otherlibs/threads/Makefile n.ocaml-3.08.4/otherlibs/threads/Makefile
---- b.ocaml-3.08.4/otherlibs/threads/Makefile	2003-07-17 10:38:28.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/threads/Makefile	2005-11-04 21:26:14.790318576 +0100
+diff -ur ocaml-3.11.0/otherlibs/systhreads/Makefile.nt ocaml-3.11.0.CFLAGS/otherlibs/systhreads/Makefile.nt
+--- ocaml-3.11.0/otherlibs/systhreads/Makefile.nt	2007-11-06 16:16:56.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/otherlibs/systhreads/Makefile.nt	2009-02-16 12:18:01.285892127 +0100
+@@ -20,7 +20,7 @@
+ CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib -I ../win32unix
+ COMPFLAGS=-warn-error A -g
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+-CFLAGS=-I../../byterun $(EXTRACFLAGS)
++override CFLAGS += -I../../byterun $(EXTRACFLAGS)
+ 
+ CAMLOBJS=thread.cmo mutex.cmo condition.cmo event.cmo threadUnix.cmo
+ CMIFILES=$(CAMLOBJS:.cmo=.cmi)
+diff -ur ocaml-3.11.0/otherlibs/threads/Makefile ocaml-3.11.0.CFLAGS/otherlibs/threads/Makefile
+--- ocaml-3.11.0/otherlibs/threads/Makefile	2008-10-08 15:07:13.000000000 +0200
++++ ocaml-3.11.0.CFLAGS/otherlibs/threads/Makefile	2009-02-16 12:18:01.285892127 +0100
 @@ -16,7 +16,7 @@
  include ../../config/Makefile
  
@@ -269,45 +147,9 @@ diff -Nur b.ocaml-3.08.4/otherlibs/threads/Makefile n.ocaml-3.08.4/otherlibs/thr
  CAMLC=../../ocamlcomp.sh -I ../unix
  MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
  COMPFLAGS=-warn-error A
-diff -Nur b.ocaml-3.08.4/otherlibs/unix/Makefile n.ocaml-3.08.4/otherlibs/unix/Makefile
---- b.ocaml-3.08.4/otherlibs/unix/Makefile	2004-04-09 15:25:20.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/unix/Makefile	2005-11-04 21:26:14.792318272 +0100
-@@ -19,7 +19,7 @@
- 
- # Compilation options
- CC=$(BYTECC)
--CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-+override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
- CAMLC=../../ocamlcomp.sh
- CAMLOPT=../../ocamlcompopt.sh
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
-diff -Nur b.ocaml-3.08.4/otherlibs/win32graph/Makefile.nt n.ocaml-3.08.4/otherlibs/win32graph/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/win32graph/Makefile.nt	2004-06-21 17:31:58.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/win32graph/Makefile.nt	2005-11-04 21:26:14.793318120 +0100
-@@ -17,7 +17,7 @@
- 
- # Compilation options
- CC=$(BYTECC)
--CFLAGS=-I../../byterun
-+override CFLAGS += -I../../byterun
- CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib
- CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
- COMPFLAGS=-warn-error A
-diff -Nur b.ocaml-3.08.4/otherlibs/win32unix/Makefile.nt n.ocaml-3.08.4/otherlibs/win32unix/Makefile.nt
---- b.ocaml-3.08.4/otherlibs/win32unix/Makefile.nt	2004-05-30 10:17:06.000000000 +0200
-+++ n.ocaml-3.08.4/otherlibs/win32unix/Makefile.nt	2005-11-04 21:26:14.794317968 +0100
-@@ -17,7 +17,7 @@
- 
- # Compilation options
- CC=$(BYTECC)
--CFLAGS=-I../../byterun -I../unix
-+override CFLAGS += -I../../byterun -I../unix
- CAMLC=../../boot/ocamlrun ../../ocamlc -I ../../stdlib
- CAMLOPT=../../boot/ocamlrun ../../ocamlopt -I ../../stdlib
- COMPFLAGS=-warn-error A
-diff -Nur b.ocaml-3.08.4/win32caml/Makefile n.ocaml-3.08.4/win32caml/Makefile
---- b.ocaml-3.08.4/win32caml/Makefile	2004-06-17 09:33:44.000000000 +0200
-+++ n.ocaml-3.08.4/win32caml/Makefile	2005-11-04 21:26:14.803316600 +0100
+diff -ur ocaml-3.11.0/win32caml/Makefile ocaml-3.11.0.CFLAGS/win32caml/Makefile
+--- ocaml-3.11.0/win32caml/Makefile	2007-11-15 14:21:15.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/win32caml/Makefile	2009-02-16 12:18:01.289259949 +0100
 @@ -16,7 +16,7 @@
  include ../config/Makefile
  
@@ -317,9 +159,9 @@ diff -Nur b.ocaml-3.08.4/win32caml/Makefile n.ocaml-3.08.4/win32caml/Makefile
  
  OBJS=startocaml.$(O) ocamlres.$(O) ocaml.$(O) menu.$(O) \
    history.$(O) editbuffer.$(O)
-diff -Nur b.ocaml-3.08.4/yacc/Makefile n.ocaml-3.08.4/yacc/Makefile
---- b.ocaml-3.08.4/yacc/Makefile	2000-08-10 11:58:08.000000000 +0200
-+++ n.ocaml-3.08.4/yacc/Makefile	2005-11-04 21:26:14.803316600 +0100
+diff -ur ocaml-3.11.0/yacc/Makefile ocaml-3.11.0.CFLAGS/yacc/Makefile
+--- ocaml-3.11.0/yacc/Makefile	2007-02-07 15:49:42.000000000 +0100
++++ ocaml-3.11.0.CFLAGS/yacc/Makefile	2009-02-16 12:18:01.289259949 +0100
 @@ -17,7 +17,7 @@
  include ../config/Makefile