Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Apr 2016 11:04:34 +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: r413724 - head/databases/mariadb100-server
Message-ID:  <201604211104.u3LB4YiS040549@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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@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



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