From c9ebe13829fb11421e7a6d462901564ed4348535 Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Sat, 14 Dec 2002 20:03:21 +0000
Subject: [PATCH] remove hardcoded "-O" from compiler calls

naddy@ OK
---
 lang/ocaml/patches/patch-asmrun_Makefile      | 12 +++++++++++
 lang/ocaml/patches/patch-byterun_Makefile     | 12 +++++++++++
 .../patches/patch-otherlibs_bigarray_Makefile | 12 +++++++++++
 .../ocaml/patches/patch-otherlibs_db_Makefile | 12 +++++++++++
 .../patches/patch-otherlibs_dbm_Makefile      | 12 +++++++++++
 .../patches/patch-otherlibs_graph_Makefile    | 12 +++++++++++
 .../patches/patch-otherlibs_num_Makefile      | 12 +++++++++++
 .../patch-otherlibs_num_bignum_Makefile       | 12 +++++++++++
 .../patches/patch-otherlibs_str_Makefile      | 12 +++++++++++
 ...patch-otherlibs_str_regex-0_12_Makefile_in | 12 +++++++++++
 .../patch-otherlibs_systhreads_Makefile       | 21 +++++++++++++++++++
 .../patches/patch-otherlibs_threads_Makefile  | 12 +++++++++++
 .../patches/patch-otherlibs_unix_Makefile     | 12 +++++++++++
 lang/ocaml/patches/patch-yacc_Makefile        | 12 +++++++++++
 14 files changed, 177 insertions(+)
 create mode 100644 lang/ocaml/patches/patch-asmrun_Makefile
 create mode 100644 lang/ocaml/patches/patch-byterun_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_bigarray_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_db_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_dbm_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_graph_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_num_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_num_bignum_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_str_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_str_regex-0_12_Makefile_in
 create mode 100644 lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_threads_Makefile
 create mode 100644 lang/ocaml/patches/patch-otherlibs_unix_Makefile
 create mode 100644 lang/ocaml/patches/patch-yacc_Makefile

diff --git a/lang/ocaml/patches/patch-asmrun_Makefile b/lang/ocaml/patches/patch-asmrun_Makefile
new file mode 100644
index 00000000000..d55970fb9bc
--- /dev/null
+++ b/lang/ocaml/patches/patch-asmrun_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-asmrun_Makefile,v 1.1 2002/12/14 20:03:21 sturm Exp $
+--- asmrun/Makefile.orig	Fri Dec 13 23:03:13 2002
++++ asmrun/Makefile	Fri Dec 13 23:03:26 2002
+@@ -17,7 +17,7 @@ include ../config/Makefile
+ 
+ CC=$(NATIVECC)
+ FLAGS=-I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) 
+-CFLAGS=$(FLAGS) -O $(NATIVECCCOMPOPTS)
++CFLAGS=$(FLAGS) $(NATIVECCCOMPOPTS)
+ DFLAGS=$(FLAGS) -g -DDEBUG $(NATIVECCCOMPOPTS)
+ PFLAGS=$(FLAGS) -pg -O -DPROFILING $(NATIVECCPROFOPTS)
+ 
diff --git a/lang/ocaml/patches/patch-byterun_Makefile b/lang/ocaml/patches/patch-byterun_Makefile
new file mode 100644
index 00000000000..a733b0c4444
--- /dev/null
+++ b/lang/ocaml/patches/patch-byterun_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-byterun_Makefile,v 1.1 2002/12/14 20:03:21 sturm Exp $
+--- byterun/Makefile.orig	Fri Dec 13 23:03:55 2002
++++ byterun/Makefile	Fri Dec 13 23:04:05 2002
+@@ -16,7 +16,7 @@
+ include ../config/Makefile
+ 
+ CC=$(BYTECC)
+-CFLAGS=-O $(BYTECCCOMPOPTS)
++CFLAGS=$(BYTECCCOMPOPTS)
+ DFLAGS=-g -DDEBUG $(BYTECCCOMPOPTS)
+ 
+ OBJS=interp.o misc.o stacks.o fix_code.o startup.o main.o \
diff --git a/lang/ocaml/patches/patch-otherlibs_bigarray_Makefile b/lang/ocaml/patches/patch-otherlibs_bigarray_Makefile
new file mode 100644
index 00000000000..5b934d1f0e7
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_bigarray_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_bigarray_Makefile,v 1.1 2002/12/14 20:03:21 sturm Exp $
+--- otherlibs/bigarray/Makefile.orig	Fri Dec 13 23:06:23 2002
++++ otherlibs/bigarray/Makefile	Fri Dec 13 23:06:35 2002
+@@ -16,7 +16,7 @@
+ include ../../config/Makefile
+ 
+ CC=$(BYTECC)
+-CFLAGS=-I../../byterun -g -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=-I../../byterun -g $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ CAMLC=../../ocamlcomp.sh -I ../unix
+ CAMLOPT=../../ocamlcompopt.sh -I ../unix
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
diff --git a/lang/ocaml/patches/patch-otherlibs_db_Makefile b/lang/ocaml/patches/patch-otherlibs_db_Makefile
new file mode 100644
index 00000000000..93464def61b
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_db_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_db_Makefile,v 1.1 2002/12/14 20:03:21 sturm Exp $
+--- otherlibs/db/Makefile.orig	Fri Dec 13 23:06:41 2002
++++ otherlibs/db/Makefile	Fri Dec 13 23:07:02 2002
+@@ -24,7 +24,7 @@ CAMLOPT=../../ocamlcompopt.sh
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+ COMPFLAGS=-warn-error A
+ 
+-CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ COBJS=dbstubs.o
+ 
+ all: libmldb.a db.cmi db.cma
diff --git a/lang/ocaml/patches/patch-otherlibs_dbm_Makefile b/lang/ocaml/patches/patch-otherlibs_dbm_Makefile
new file mode 100644
index 00000000000..9fba59e6828
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_dbm_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_dbm_Makefile,v 1.1 2002/12/14 20:03:21 sturm Exp $
+--- otherlibs/dbm/Makefile.orig	Fri Dec 13 23:07:13 2002
++++ otherlibs/dbm/Makefile	Fri Dec 13 23:07:28 2002
+@@ -24,7 +24,7 @@ CAMLOPT=../../ocamlcompopt.sh
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+ COMPFLAGS=-warn-error A
+ 
+-CFLAGS=$(DBM_INCLUDES) -I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=$(DBM_INCLUDES) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ COBJS=cldbm.o
+ 
+ all: libmldbm.a dbm.cmi dbm.cma
diff --git a/lang/ocaml/patches/patch-otherlibs_graph_Makefile b/lang/ocaml/patches/patch-otherlibs_graph_Makefile
new file mode 100644
index 00000000000..fd22a3549e0
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_graph_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_graph_Makefile,v 1.1 2002/12/14 20:03:21 sturm Exp $
+--- otherlibs/graph/Makefile.orig	Fri Dec 13 23:07:37 2002
++++ otherlibs/graph/Makefile	Fri Dec 13 23:07:46 2002
+@@ -18,7 +18,7 @@
+ include ../../config/Makefile
+ 
+ CC=$(BYTECC)
+-CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=-I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ CAMLC=../../ocamlcomp.sh
+ CAMLOPT=../../ocamlcompopt.sh
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
diff --git a/lang/ocaml/patches/patch-otherlibs_num_Makefile b/lang/ocaml/patches/patch-otherlibs_num_Makefile
new file mode 100644
index 00000000000..bd42899e8b2
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_num_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_num_Makefile,v 1.1 2002/12/14 20:03:21 sturm Exp $
+--- otherlibs/num/Makefile.orig	Fri Dec 13 23:08:13 2002
++++ otherlibs/num/Makefile	Fri Dec 13 23:08:20 2002
+@@ -19,7 +19,7 @@ include ../../config/Makefile
+ 
+ # Compilation options
+ CC=$(BYTECC)
+-CFLAGS=-O -I./bignum/h -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=-I./bignum/h -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ CAMLC=../../ocamlcomp.sh -w s
+ CAMLOPT=../../ocamlcompopt.sh -w s
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
diff --git a/lang/ocaml/patches/patch-otherlibs_num_bignum_Makefile b/lang/ocaml/patches/patch-otherlibs_num_bignum_Makefile
new file mode 100644
index 00000000000..09ac9aefca1
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_num_bignum_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_num_bignum_Makefile,v 1.1 2002/12/14 20:03:22 sturm Exp $
+--- otherlibs/num/bignum/Makefile.orig	Fri Dec 13 23:07:56 2002
++++ otherlibs/num/bignum/Makefile	Fri Dec 13 23:08:05 2002
+@@ -11,7 +11,7 @@ RANLIBTEST=test -f /usr/bin/ranlib -o -f
+ LIB = libbignum.a
+ OBJECT = o/KerN.o o/bnInit.o o/bnMult.o o/bnDivide.o o/bnCmp.o o/bzf.o o/bz.o 
+ KERNH = h/BigNum.h 
+-CFLAGS = -c -I./h -O -DCAML_LIGHT
++CFLAGS = -c -I./h -DCAML_LIGHT
+ LDFLAGS =
+ 
+ # extra entries:
diff --git a/lang/ocaml/patches/patch-otherlibs_str_Makefile b/lang/ocaml/patches/patch-otherlibs_str_Makefile
new file mode 100644
index 00000000000..16c4472b35b
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_str_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_str_Makefile,v 1.1 2002/12/14 20:03:22 sturm Exp $
+--- otherlibs/str/Makefile.orig	Fri Dec 13 23:08:30 2002
++++ otherlibs/str/Makefile	Fri Dec 13 23:08:37 2002
+@@ -19,7 +19,7 @@ include ../../config/Makefile
+ 
+ # Compilation options
+ CC=$(BYTECC)
+-CFLAGS=-O -I$(REGEXLIB) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=-I$(REGEXLIB) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ CAMLC=../../ocamlcomp.sh
+ CAMLOPT=../../ocamlcompopt.sh
+ COMPFLAGS=-warn-error A
diff --git a/lang/ocaml/patches/patch-otherlibs_str_regex-0_12_Makefile_in b/lang/ocaml/patches/patch-otherlibs_str_regex-0_12_Makefile_in
new file mode 100644
index 00000000000..4fc773a32b4
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_str_regex-0_12_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_str_regex-0_12_Makefile_in,v 1.1 2002/12/14 20:03:22 sturm Exp $
+--- otherlibs/str/regex-0.12/Makefile.in.orig	Fri Dec 13 23:31:14 2002
++++ otherlibs/str/regex-0.12/Makefile.in	Fri Dec 13 23:32:53 2002
+@@ -29,7 +29,7 @@ version = 0.12
+ CPPFLAGS = 
+ 
+ # Likewise, you can override CFLAGS to optimize, use -Wall, etc.
+-CFLAGS = -O
++# CFLAGS = -O
+ 
+ # Ditto for LDFLAGS and LOADLIBES.
+ LDFLAGS =
diff --git a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
new file mode 100644
index 00000000000..f98ef96488e
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile
@@ -0,0 +1,21 @@
+$OpenBSD: patch-otherlibs_systhreads_Makefile,v 1.1 2002/12/14 20:03:22 sturm Exp $
+--- otherlibs/systhreads/Makefile.orig	Fri Dec 13 23:08:50 2002
++++ otherlibs/systhreads/Makefile	Fri Dec 13 23:09:29 2002
+@@ -35,7 +35,7 @@ libthreads.a: $(BYTECODE_C_OBJS)
+ 	$(MKLIB) -o threads $(BYTECODE_C_OBJS)
+ 
+ posix_b.o: posix.c
+-	$(BYTECC) -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
++	$(BYTECC) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
+ 	   -c posix.c
+ 	mv posix.o posix_b.o
+ 
+@@ -45,7 +45,7 @@ libthreadsnat.a: $(NATIVECODE_C_OBJS)
+ 	$(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) -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
+ 	mv posix.o posix_n.o
+ 
+ threads.cma: $(THREAD_OBJS)
diff --git a/lang/ocaml/patches/patch-otherlibs_threads_Makefile b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
new file mode 100644
index 00000000000..ef302c29edb
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_threads_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_threads_Makefile,v 1.1 2002/12/14 20:03:22 sturm Exp $
+--- otherlibs/threads/Makefile.orig	Fri Dec 13 23:09:39 2002
++++ otherlibs/threads/Makefile	Fri Dec 13 23:09:47 2002
+@@ -16,7 +16,7 @@
+ include ../../config/Makefile
+ 
+ CC=$(BYTECC)
+-CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
++CFLAGS=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
+ CAMLC=../../ocamlcomp.sh -I ../unix
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+ COMPFLAGS=-warn-error A
diff --git a/lang/ocaml/patches/patch-otherlibs_unix_Makefile b/lang/ocaml/patches/patch-otherlibs_unix_Makefile
new file mode 100644
index 00000000000..9ad01e4228a
--- /dev/null
+++ b/lang/ocaml/patches/patch-otherlibs_unix_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-otherlibs_unix_Makefile,v 1.1 2002/12/14 20:03:22 sturm Exp $
+--- otherlibs/unix/Makefile.orig	Fri Dec 13 23:09:56 2002
++++ otherlibs/unix/Makefile	Fri Dec 13 23:10:12 2002
+@@ -19,7 +19,7 @@ include ../../config/Makefile
+ 
+ # Compilation options
+ CC=$(BYTECC)
+-CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ CAMLC=../../ocamlcomp.sh
+ CAMLOPT=../../ocamlcompopt.sh
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
diff --git a/lang/ocaml/patches/patch-yacc_Makefile b/lang/ocaml/patches/patch-yacc_Makefile
new file mode 100644
index 00000000000..cf0788b0246
--- /dev/null
+++ b/lang/ocaml/patches/patch-yacc_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-yacc_Makefile,v 1.1 2002/12/14 20:03:22 sturm Exp $
+--- yacc/Makefile.orig	Fri Dec 13 23:05:42 2002
++++ yacc/Makefile	Fri Dec 13 23:05:51 2002
+@@ -17,7 +17,7 @@
+ include ../config/Makefile
+ 
+ CC=$(BYTECC)
+-CFLAGS=-O -DNDEBUG $(BYTECCCOMPOPTS)
++CFLAGS=-DNDEBUG $(BYTECCCOMPOPTS)
+ 
+ OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \
+   skeleton.o symtab.o verbose.o warshall.o