svn commit: r461712 - in head/databases/mariadb100-server: . files
Bernard Spil
brnrd at FreeBSD.org
Tue Feb 13 16:42:32 UTC 2018
Author: brnrd
Date: Tue Feb 13 16:42:31 2018
New Revision: 461712
URL: https://svnweb.freebsd.org/changeset/ports/461712
Log:
databases/mariadb100-server: unbreak OQGraph engine
- Fixes collision in setbit with sys/param.h [1]
- Add option to add unixODBC and xml feature to CONNECT engine
PR: 224089
Reported by: jbeich
Added:
head/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291
- copied unchanged from r461711, head/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291
Modified:
head/databases/mariadb100-server/Makefile
Modified: head/databases/mariadb100-server/Makefile
==============================================================================
--- head/databases/mariadb100-server/Makefile Tue Feb 13 16:33:06 2018 (r461711)
+++ head/databases/mariadb100-server/Makefile Tue Feb 13 16:42:31 2018 (r461712)
@@ -18,7 +18,6 @@ MAINTAINER= brnrd at FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
LICENSE= GPLv2
-#LICENSE_FILE= ${WRKSRC}/COPYING
LICENSE_NAME_PerconaFT= PerconaFT patents license
LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
@@ -74,11 +73,12 @@ CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*
.if !defined(CLIENT_ONLY)
# MySQL-Server options
-OPTIONS_DEFINE+= MAXKEY
+OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY
OPTIONS_DEFAULT+= MAXKEY
OPTIONS_GROUP= ENGINES
OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB
+CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine
ENGINES_DESC= Optional MariaDB storage engines
INNOBASE_DESC= Build InnoDB engine next to XtraDB
MAXKEY_DESC= Change max key length from 1000 to 4000
@@ -113,14 +113,14 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \
${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1
.endfor
+CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
+CONNECT_EXTRA_USE= gnome=libxml2
INNOBASE_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-MDEV-15288
MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1
MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
-# See https://mariadb.atlassian.net/browse/MDEV-15291.
-OQGRAPH_BROKEN= OQGraph does not build
TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy
TOKUDB_PORTDOCS= PATENTS README.md
TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
@@ -130,10 +130,14 @@ post-install:
# These are "client" components, so there should be a switch that
# prevents them from being installed but it's unknown right now
. for f in bin/msql2mysql bin/mysql_config bin/mysql_find_rows \
- bin/mysqlaccess COPYING.AGPLv3 COPYING.GPLv2 share/aclocal/mysql.m4
+ bin/mysqlaccess share/aclocal/mysql.m4
${RM} ${STAGEDIR}${PREFIX}/${f}
. endfor
${RM} -r ${STAGEDIR}${DATADIR}/SELinux
+
+post-install-TOKUDB-on:
+ ${RM} ${STAGEDIR}${DOCSDIR}/COPYING.GPLv2 \
+ ${STAGEDIR}${DOCSDIR}/COPYING.AGPLv3
.endif
.include <bsd.port.pre.mk>
Copied: head/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291 (from r461711, head/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb100-server/files/patch-oqgraph-MDEV-15291 Tue Feb 13 16:42:31 2018 (r461712, copy of r461711, head/databases/mariadb101-server/files/patch-oqgraph-MDEV-15291)
@@ -0,0 +1,40 @@
+--- storage/oqgraph/oqgraph_judy.cc.orig 2018-02-12 15:01:28 UTC
++++ storage/oqgraph/oqgraph_judy.cc
+@@ -27,7 +27,7 @@
+ /*
+ Currently the only active code that can return error is:
+ judy_bitset::reset()/J1U()
+- judy_bitset::setbit()/J1S()
++ judy_bitset::jsetbit()/J1S()
+
+ In most cases errors are either about wrong parameters passed to Judy
+ functions or internal structures corruption. These definitely deserve
+@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
+ return rc == 1;
+ }
+
+-open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
++open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
+ {
+ int rc;
+ J1S(rc, array, n);
+--- storage/oqgraph/oqgraph_judy.h.orig 2018-02-12 15:01:28 UTC
++++ storage/oqgraph/oqgraph_judy.h
+@@ -63,7 +63,7 @@ namespace open_query
+ if (!val)
+ return reset(n);
+ else
+- return setbit(n);
++ return jsetbit(n);
+ }
+
+ judy_bitset& set(const judy_bitset& src);
+@@ -115,7 +115,7 @@ namespace open_query
+ private:
+ mutable void* array;
+
+- judy_bitset& setbit(size_type n);
++ judy_bitset& jsetbit(size_type n);
+ };
+ }
+
More information about the svn-ports-head
mailing list