View | Details | Raw Unified | Return to bug 207675
Collapse All | Expand All

(-)databases/mariadb101-server/Makefile (-5 / +2 lines)
Lines 28-34 Link Here
28
SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
28
SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
29
29
30
OPTIONS_DEFINE=		FASTMTX
30
OPTIONS_DEFINE=		FASTMTX
31
OPTIONS_SINGLE= 	GSSAPI
31
OPTIONS_SINGLE=		GSSAPI
32
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
32
OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
33
OPTIONS_DEFAULT=	GSSAPI_BASE
33
OPTIONS_DEFAULT=	GSSAPI_BASE
34
34
Lines 45-51 Link Here
45
INNOBASE_DESC=	Build InnoDB engine next to XtraDB
45
INNOBASE_DESC=	Build InnoDB engine next to XtraDB
46
MAXKEY_DESC=	Change max key length from 1000 to 4000
46
MAXKEY_DESC=	Change max key length from 1000 to 4000
47
MROONGA_DESC=	Mroonga Full Text Search engine
47
MROONGA_DESC=	Mroonga Full Text Search engine
48
OQGRAPH_DESC=	Open Query Graph Computation engine (Requires GCC)
48
OQGRAPH_DESC=	Open Query Graph Computation engine
49
SPHINX_DESC=	SphinxSE engine
49
SPHINX_DESC=	SphinxSE engine
50
SPIDER_DESC=	Partitioning and XA-transactions engine
50
SPIDER_DESC=	Partitioning and XA-transactions engine
51
TOKUDB_DESC=	Fractal tree index tree data structure engine
51
TOKUDB_DESC=	Fractal tree index tree data structure engine
Lines 114-122 Link Here
114
MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my__compare.h
114
MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my__compare.h
115
OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
115
OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
116
			libJudy.so:${PORTSDIR}/devel/judy
116
			libJudy.so:${PORTSDIR}/devel/judy
117
# Currently OQGraph does not build using clang.
118
# See See https://mariadb.atlassian.net/browse/MDEV-8051.
119
OQGRAPH_USE=		gcc=yes
120
TOKUDB_LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
117
TOKUDB_LIB_DEPENDS=	libsnappy.so:${PORTSDIR}/archivers/snappy
121
118
122
post-install:
119
post-install:
(-)databases/mariadb101-server/files/patch-cmake_ssl.cmake (-4 / +14 lines)
Lines 1-7 Link Here
1
MariaDB prefers static libraries, breaks builds with
1
--- cmake/ssl.cmake.orig	2016-01-28 12:12:42 UTC
2
ports' OpenSSL libs
3
4
--- cmake/ssl.cmake.orig	2015-12-23 15:33:29 UTC
5
+++ cmake/ssl.cmake
2
+++ cmake/ssl.cmake
6
@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
3
@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
7
 
4
 
Lines 16-18 Link Here
16
     FIND_LIBRARY(OPENSSL_LIBRARIES
13
     FIND_LIBRARY(OPENSSL_LIBRARIES
17
                  NAMES ssl ssleay32 ssleay32MD
14
                  NAMES ssl ssleay32 ssleay32MD
18
                  HINTS ${OPENSSL_ROOT_DIR}/lib)
15
                  HINTS ${OPENSSL_ROOT_DIR}/lib)
16
@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL)
17
                  HINTS ${OPENSSL_ROOT_DIR}/lib)
18
     MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR
19
       OPENSSL_INCLUDE_DIR)
20
-    IF (WITH_SSL_PATH)
21
-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
22
-    ENDIF()
23
+#    IF (WITH_SSL_PATH)
24
+#      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
25
+#    ENDIF()
26
 
27
     INCLUDE(CheckSymbolExists)
28
     SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
(-)databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc (+11 lines)
Line 0 Link Here
1
--- storage/oqgraph/graphcore.cc.orig	2016-01-28 12:12:55 UTC
2
+++ storage/oqgraph/graphcore.cc
3
@@ -485,7 +485,7 @@ namespace open_query
4
   optional<Vertex>
5
   oqgraph_share::find_vertex(VertexID id) const
6
   {
7
-    return ::boost::find_vertex(id, g);
8
+    return oqgraph3::find_vertex(id, g);
9
   }
10
 
11
 #if 0
(-)databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h (+73 lines)
Line 0 Link Here
1
--- storage/oqgraph/oqgraph_shim.h.orig	2016-01-28 12:12:55 UTC
2
+++ storage/oqgraph/oqgraph_shim.h
3
@@ -254,7 +254,7 @@ namespace boost
4
     typedef no_property type;
5
   };
6
 
7
-#if BOOST_VERSION >= 104601
8
+#if BOOST_VERSION >= 104601 && BOOST_VERSION < 104900
9
   template <>
10
   struct graph_bundle_type<oqgraph3::graph>
11
   {
12
@@ -274,6 +274,33 @@ namespace boost
13
   };
14
 #endif
15
 
16
+  template<>
17
+  struct property_map<oqgraph3::graph, edge_weight_t>
18
+  {
19
+    typedef void type;
20
+    typedef oqgraph3::edge_weight_property_map const_type;
21
+  };
22
+
23
+  template<>
24
+  struct property_map<oqgraph3::graph, vertex_index_t>
25
+  {
26
+    typedef void type;
27
+    typedef oqgraph3::vertex_index_property_map const_type;
28
+  };
29
+
30
+  template<>
31
+  struct property_map<oqgraph3::graph, edge_index_t>
32
+  {
33
+    typedef void type;
34
+    typedef oqgraph3::edge_index_property_map const_type;
35
+  };
36
+
37
+}
38
+
39
+namespace oqgraph3
40
+{
41
+  using namespace boost;
42
+
43
   inline graph_traits<oqgraph3::graph>::vertex_descriptor
44
   source(
45
       const graph_traits<oqgraph3::graph>::edge_descriptor& e,
46
@@ -401,27 +428,6 @@ namespace boost
47
     return count;
48
   }
49
 
50
-  template<>
51
-  struct property_map<oqgraph3::graph, edge_weight_t>
52
-  {
53
-    typedef void type;
54
-    typedef oqgraph3::edge_weight_property_map const_type;
55
-  };
56
-
57
-  template<>
58
-  struct property_map<oqgraph3::graph, vertex_index_t>
59
-  {
60
-    typedef void type;
61
-    typedef oqgraph3::vertex_index_property_map const_type;
62
-  };
63
-
64
-  template<>
65
-  struct property_map<oqgraph3::graph, edge_index_t>
66
-  {
67
-    typedef void type;
68
-    typedef oqgraph3::edge_index_property_map const_type;
69
-  };
70
-
71
   inline property_map<
72
       oqgraph3::graph,
73
       edge_weight_t>::const_type::reference

Return to bug 207675