summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-08-20 12:24:45 +0000
committerjperkin <jperkin@pkgsrc.org>2015-08-20 12:24:45 +0000
commitcfaa61f11bbd75d9437d022262de7d55347915c2 (patch)
treea1bdb536e8c6fd66f93ae337308c3aa74c18715a /databases
parentb908f0cc275c32f25e45f2dbd242a3107086eccb (diff)
downloadpkgsrc-cfaa61f11bbd75d9437d022262de7d55347915c2.tar.gz
Add memcached option (disabled by default).
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql56-client/options.mk14
-rw-r--r--databases/mysql56-server/PLIST4
2 files changed, 16 insertions, 2 deletions
diff --git a/databases/mysql56-client/options.mk b/databases/mysql56-client/options.mk
index a9018427598..4ce2bd1fde2 100644
--- a/databases/mysql56-client/options.mk
+++ b/databases/mysql56-client/options.mk
@@ -1,9 +1,10 @@
-# $NetBSD: options.mk,v 1.8 2015/07/30 14:39:18 adam Exp $
+# $NetBSD: options.mk,v 1.9 2015/08/20 12:24:45 jperkin Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5
# ndb-cluster does not configure with cmake
PKG_SUPPORTED_OPTIONS+= dtrace embedded-server ndb-cluster sphinx ssl
+PKG_SUPPORTED_OPTIONS+= memcached
PKG_SUGGESTED_OPTIONS+= embedded-server ssl
.include "../../mk/bsd.options.mk"
@@ -21,6 +22,17 @@ CMAKE_ARGS+= -DWITH_SSL=no
CMAKE_ARGS+= -DENABLE_DTRACE=ON
.endif
+# Enable InnoDB Memcached support
+PLIST_VARS+= memcached
+.if !empty(PKG_OPTIONS:Mmemcached)
+PLIST.memcached= yes
+CMAKE_ARGS+= -DWITH_INNODB_MEMCACHED=ON
+CMAKE_ARGS+= -DWITH_BUNDLED_MEMCACHED=ON
+.include "../../devel/libevent/buildlink3.mk"
+.else
+CMAKE_ARGS+= -DWITH_INNODB_MEMCACHED=OFF
+.endif
+
# Enable Sphinx SE support
# http://sphinxsearch.com/docs/current.html#sphinxse-overview
PLIST_VARS+= sphinx
diff --git a/databases/mysql56-server/PLIST b/databases/mysql56-server/PLIST
index 2dd60826cce..5857afecc7d 100644
--- a/databases/mysql56-server/PLIST
+++ b/databases/mysql56-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2015/07/30 14:39:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/08/20 12:24:45 jperkin Exp $
bin/innochecksum
bin/my_print_defaults
bin/myisam_ftdump
@@ -22,7 +22,9 @@ ${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so
lib/mysql/plugin/auth_test_plugin.so
lib/mysql/plugin/daemon_example.ini
${PLIST.sphinx}lib/mysql/plugin/ha_sphinx.so
+${PLIST.memcached}lib/mysql/plugin/innodb_engine.so
lib/mysql/plugin/libdaemon_example.so
+${PLIST.memcached}lib/mysql/plugin/libmemcached.so
lib/mysql/plugin/mypluglib.so
lib/mysql/plugin/mysql_no_login.so
lib/mysql/plugin/qa_auth_client.so