svn commit: r422368 - in branches/2016Q3/databases/mariadb101-server: . files
Bernard Spil
brnrd at FreeBSD.org
Sun Sep 18 10:39:39 UTC 2016
Author: brnrd
Date: Sun Sep 18 10:39:38 2016
New Revision: 422368
URL: https://svnweb.freebsd.org/changeset/ports/422368
Log:
MFH: r418977
databases/mariadb101-server: Fix lz4 linking fix
- Remove some testing leftover
- Fix patch error
Approved by: ports-secteam
Modified:
branches/2016Q3/databases/mariadb101-server/Makefile
branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h
Directory Properties:
branches/2016Q3/ (props changed)
Modified: branches/2016Q3/databases/mariadb101-server/Makefile
==============================================================================
--- branches/2016Q3/databases/mariadb101-server/Makefile Sun Sep 18 10:38:16 2016 (r422367)
+++ branches/2016Q3/databases/mariadb101-server/Makefile Sun Sep 18 10:39:38 2016 (r422368)
@@ -27,7 +27,7 @@ SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
SLAVEDIRS= databases/mariadb101-client
-USES= bison:build cmake compiler:c++11-lib cpe execinfo shebangfix
+USES= bison:build cmake compiler:c++11-lib cpe execinfo ssl shebangfix
USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES= scripts/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
@@ -95,7 +95,6 @@ CONFLICTS_INSTALL= mariadb5*-${PKGNAMESU
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
-USE_OPENSSL= yes
FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1
OPTIONS_SUB= yes
@@ -105,8 +104,8 @@ USES+= readline
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
.else
# MySQL-Server part
-USE_MYSQL= yes
-WANT_MYSQL_VER= 101m
+USES+= mysql:101m
+USE_GNOME= libxml2
USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
USE_RC_SUBR= mysql-server
USERS= mysql
@@ -123,6 +122,7 @@ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO
MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
+MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy
@@ -172,4 +172,10 @@ post-patch:
${WRKSRC}/cmake/os/DragonFly.cmake
.endif
+.if exists(${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt)
+post-configure:
+ @${REINPLACE_CMD} "s|/usr/bin/c++ |/usr/bin/c++ -L${LOCALBASE}/lib |" \
+ ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt
+.endif
+
.include <bsd.port.post.mk>
Modified: branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h
==============================================================================
--- branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Sun Sep 18 10:38:16 2016 (r422367)
+++ branches/2016Q3/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h Sun Sep 18 10:39:38 2016 (r422368)
@@ -3,15 +3,6 @@ https://jira.mariadb.org/projects/MDEV/i
--- storage/oqgraph/oqgraph_shim.h.orig 2016-01-28 12:12:55 UTC
+++ storage/oqgraph/oqgraph_shim.h
-@@ -254,7 +254,7 @@ namespace boost
- typedef no_property type;
- };
-
--#if BOOST_VERSION >= 104601
-+#if BOOST_VERSION >= 104601 && BOOST_VERSION < 104900
- template <>
- struct graph_bundle_type<oqgraph3::graph>
- {
@@ -274,6 +274,33 @@ namespace boost
};
#endif
More information about the svn-ports-all
mailing list