Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Feb 2016 11:27:44 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r408559 - head/databases/ocaml-sqlite3
Message-ID:  <201602091127.u19BRiXQ091604@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Feb  9 11:27:43 2016
New Revision: 408559
URL: https://svnweb.freebsd.org/changeset/ports/408559

Log:
  - Fix build on 9.x

Modified:
  head/databases/ocaml-sqlite3/Makefile

Modified: head/databases/ocaml-sqlite3/Makefile
==============================================================================
--- head/databases/ocaml-sqlite3/Makefile	Tue Feb  9 11:12:06 2016	(r408558)
+++ head/databases/ocaml-sqlite3/Makefile	Tue Feb  9 11:27:43 2016	(r408559)
@@ -15,7 +15,7 @@ LICENSE_NAME=	OCaml-SQLite3 unique permi
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=			gmake pkgconfig sqlite
+USES=			compiler:features gmake pkgconfig sqlite
 USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
@@ -29,9 +29,15 @@ GH_ACCOUNT=	mmottl
 GH_PROJECT=	${PORTNAME}-ocaml
 USE_GITHUB=	yes
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /var/null" :: findlib_name,' \
 		${WRKSRC}/setup.ml
+.if ${COMPILER_TYPE} == gcc & ${COMPILER_VERSION} <= 42
+	@${REINPLACE_CMD} -e 's|-Wno-keyword-macro||' ${WRKSRC}/_oasis \
+		${WRKSRC}/myocamlbuild.ml ${WRKSRC}/setup.ml
+.endif
 
 do-configure:
 	(cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS})
@@ -42,4 +48,4 @@ do-build:
 do-install:
 	(cd ${WRKSRC} && ocaml setup.ml -install)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602091127.u19BRiXQ091604>