Date: Thu, 21 Apr 2016 11:06:28 +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: r413725 - head/databases/mariadb55-server Message-ID: <201604211106.u3LB6SEa040821@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Apr 21 11:06:28 2016 New Revision: 413725 URL: https://svnweb.freebsd.org/changeset/ports/413725 Log: - Mark OQGRAPH option BROKEN as it fails with both old and new boost - Allow to disable it properly so the build doesn't break of boost is installed - Remove OQGRAPH-related cmake flags, as they do nothing PR: 207094 Submitted by: amdmi3 Approved by: maintainer timeout (brnrd, 2 months) Modified: head/databases/mariadb55-server/Makefile Modified: head/databases/mariadb55-server/Makefile ============================================================================== --- head/databases/mariadb55-server/Makefile Thu Apr 21 11:04:33 2016 (r413724) +++ head/databases/mariadb55-server/Makefile Thu Apr 21 11:06:28 2016 (r413725) @@ -101,12 +101,12 @@ OPTIONS_DEFINE+= MAXKEY OQGRAPH OPTIONS_DEFAULT+= MAXKEY MAXKEY_DESC= Change max key length from 1000 to 4000 + OQGRAPH_DESC= Open Query Graph Computation engine -OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH_STORAGE_ENGINE=1 OQGRAPH_USE= GCC=yes -OQGRAPH_CMAKE_ON= -DWITH_OQGRAPH_STORAGE_ENGINE=1 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs +OQGRAPH_BROKEN= yes MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-include_my_compare.h .endif @@ -124,6 +124,9 @@ CMAKE_ARGS+= -DWITH_JEMALLOC="no" USE_GCC= yes .endif +post-extract-OQGRAPH-off: + @${RM} -rf ${WRKSRC}/storage/oqgraph + post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604211106.u3LB6SEa040821>