svn commit: r421867 - in head/devel/ocaml-pcre: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sun Sep 11 18:58:01 UTC 2016
Author: amdmi3
Date: Sun Sep 11 18:58:00 2016
New Revision: 421867
URL: https://svnweb.freebsd.org/changeset/ports/421867
Log:
- Fix build on 9.x bu removing unknown warning option
Approved by: portmgr blanket
Added:
head/devel/ocaml-pcre/files/
head/devel/ocaml-pcre/files/extra-patch--Wno-keyword-macro (contents, props changed)
Modified:
head/devel/ocaml-pcre/Makefile
Modified: head/devel/ocaml-pcre/Makefile
==============================================================================
--- head/devel/ocaml-pcre/Makefile Sun Sep 11 18:53:02 2016 (r421866)
+++ head/devel/ocaml-pcre/Makefile Sun Sep 11 18:58:00 2016 (r421867)
@@ -25,6 +25,13 @@ DOCSDIR= ${PREFIX}/share/doc/pcre-ocaml
OPTIONS_DEFINE= DOCS EXAMPLES
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+# unknown warning flag for old gcc
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch--Wno-keyword-macro
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|$$prefix"/"share|${STAGEDIR}${PREFIX}/share|' \
-e '/datarootdir/s|$$pkg_name|&-ocaml|' \
Added: head/devel/ocaml-pcre/files/extra-patch--Wno-keyword-macro
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ocaml-pcre/files/extra-patch--Wno-keyword-macro Sun Sep 11 18:58:00 2016 (r421867)
@@ -0,0 +1,35 @@
+--- _oasis.orig 2016-02-25 15:20:15 UTC
++++ _oasis
+@@ -32,7 +32,7 @@ Library pcre
+ BuildDepends: bytes
+ CCOpt: -g -O2 -fPIC -DPIC
+ if flag(strict) && ccomp_type(cc)
+- CCOpt+: -Wall -pedantic -Wextra -Wunused -Wno-long-long -Wno-keyword-macro
++ CCOpt+: -Wall -pedantic -Wextra -Wunused -Wno-long-long
+
+
+ # Examples
+--- myocamlbuild.ml.orig 2016-02-25 15:20:15 UTC
++++ myocamlbuild.ml
+@@ -648,8 +648,6 @@ let package_default =
+ A "-Wunused";
+ A "-ccopt";
+- A "-Wno-long-long";
+- A "-ccopt";
+- A "-Wno-keyword-macro"
++ A "-Wno-long-long"
+ ])
+ ])
+ ];
+--- setup.ml.orig 2016-02-25 15:20:15 UTC
++++ setup.ml
+@@ -6785,8 +6785,7 @@ let setup_t =
+ "-pedantic";
+ "-Wextra";
+ "-Wunused";
+- "-Wno-long-long";
+- "-Wno-keyword-macro"
++ "-Wno-long-long"
+ ])
+ ];
+ bs_cclib = [(OASISExpr.EBool true, [])];
More information about the svn-ports-all
mailing list