diff options
| author | John Marino <marino@FreeBSD.org> | 2014-03-26 17:53:01 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-03-26 17:53:01 +0000 |
| commit | 130be520d3198b942b7bd6da4f125da0c37d1689 (patch) | |
| tree | 184ff59404f9a869eebf58ce4b50917d7804daa6 /devel/omake/files/patch-OMakefile | |
| parent | Ocaml update 2/4: devel/ocaml-findlib adjust for Ocaml 4 (diff) | |
ocaml update 3/4: devel/omake major tweaks, stage support
Two dozen patches were brought in from NetBSD via dports , and this port
was staged too. Most of the patches are upstream fixes as Omake has been
updated in repo but without a new release. In any case an update was
required because it broke after Ocaml was updated to version 4.00.
Urged by: portmgr (bapt)
Diffstat (limited to 'devel/omake/files/patch-OMakefile')
| -rw-r--r-- | devel/omake/files/patch-OMakefile | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/devel/omake/files/patch-OMakefile b/devel/omake/files/patch-OMakefile index a3cc6198f7de..efa7f22778b9 100644 --- a/devel/omake/files/patch-OMakefile +++ b/devel/omake/files/patch-OMakefile @@ -1,19 +1,15 @@ ---- OMakefile.orig 2010-10-26 20:42:37.000000000 -0400 -+++ OMakefile 2013-04-03 16:50:13.000000000 -0400 -@@ -33,7 +33,6 @@ - # - # Extra options for the C compiler - # -- CFLAGS += -g -O2 -Wall -Werror -Wno-unused - - # - # We never need threads on Unix -@@ -57,7 +56,7 @@ +$NetBSD: patch-aa,v 1.2 2010/12/17 09:40:14 wiz Exp $ + +From upstream SVN. + +--- OMakefile.orig 2010-10-27 00:42:37.000000000 +0000 ++++ OMakefile +@@ -57,7 +57,7 @@ if $(not $(defined CAMLLIB)) # # OCaml options # -OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z) -+OCAMLFLAGS[] += -w Aer-29$(if $(OCAML_ACCEPTS_Z_WARNING), z) ++OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z-9-29) if $(THREADS_ENABLED) OCAMLFLAGS += -thread export |