svn commit: r413724 - head/databases/mariadb100-server
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu Apr 21 11:04:35 UTC 2016
Author: amdmi3
Date: Thu Apr 21 11:04:33 2016
New Revision: 413724
URL: https://svnweb.freebsd.org/changeset/ports/413724
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: 207115
Submitted by: amdmi3
Approved by: maintainer timeout (never at nevermind.kiev.ua, 2 months)
Modified:
head/databases/mariadb100-server/Makefile
Modified: head/databases/mariadb100-server/Makefile
==============================================================================
--- head/databases/mariadb100-server/Makefile Thu Apr 21 11:01:59 2016 (r413723)
+++ head/databases/mariadb100-server/Makefile Thu Apr 21 11:04:33 2016 (r413724)
@@ -106,12 +106,12 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON"
INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1
MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1
-OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
# Currently OQGraph does not build using clang.
# See See https://mariadb.atlassian.net/browse/MDEV-8051.
-OQGRPAH_USE= gcc
+OQGRAPH_USE= gcc
+OQGRAPH_BROKEN= does not build
post-install:
# Remove programs to avoid conflict with mariadb100-client
@@ -136,6 +136,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/my_default.c
More information about the svn-ports-head
mailing list