diff options
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mariadb/mariadb-10.2.38.ebuild | 10 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.3.29.ebuild | 10 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.4.19.ebuild | 10 | ||||
| -rw-r--r-- | dev-db/mariadb/mariadb-10.5.10.ebuild | 7 |
4 files changed, 18 insertions, 19 deletions
diff --git a/dev-db/mariadb/mariadb-10.2.38.ebuild b/dev-db/mariadb/mariadb-10.2.38.ebuild index ed459dd64677..c8f7dd82f042 100644 --- a/dev-db/mariadb/mariadb-10.2.38.ebuild +++ b/dev-db/mariadb/mariadb-10.2.38.ebuild @@ -364,12 +364,14 @@ src_configure() { ) if use server ; then - - # Federated{,X} must be treated special otherwise they will not be built as plugins + # Connect and Federated{,X} must be treated special + # otherwise they will not be built as plugins if ! use extraengine ; then mycmakeargs+=( + -DPLUGIN_CONNECT=NO -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) + -DPLUGIN_FEDERATEDX=NO + ) fi mycmakeargs+=( @@ -383,7 +385,6 @@ src_configure() { -DPLUGIN_CASSANDRA=NO -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) -DCONNECT_WITH_MYSQL=1 -DCONNECT_WITH_LIBXML2=$(usex xml) -DCONNECT_WITH_ODBC=$(usex odbc) @@ -462,7 +463,6 @@ src_configure() { -DWITH_MYISAM_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 ) - else mycmakeargs+=( -DWITHOUT_SERVER=1 diff --git a/dev-db/mariadb/mariadb-10.3.29.ebuild b/dev-db/mariadb/mariadb-10.3.29.ebuild index bb627f3fe8a7..41f203c8dbcb 100644 --- a/dev-db/mariadb/mariadb-10.3.29.ebuild +++ b/dev-db/mariadb/mariadb-10.3.29.ebuild @@ -355,12 +355,14 @@ src_configure() { ) if use server ; then - - # Federated{,X} must be treated special otherwise they will not be built as plugins + # Connect and Federated{,X} must be treated special + # otherwise they will not be built as plugins if ! use extraengine ; then mycmakeargs+=( + -DPLUGIN_CONNECT=NO -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) + -DPLUGIN_FEDERATEDX=NO + ) fi mycmakeargs+=( @@ -373,7 +375,6 @@ src_configure() { -DPLUGIN_CASSANDRA=NO -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) -DCONNECT_WITH_MYSQL=1 -DCONNECT_WITH_LIBXML2=$(usex xml) -DCONNECT_WITH_ODBC=$(usex odbc) @@ -452,7 +453,6 @@ src_configure() { -DWITH_MYISAM_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 ) - else mycmakeargs+=( -DWITHOUT_SERVER=1 diff --git a/dev-db/mariadb/mariadb-10.4.19.ebuild b/dev-db/mariadb/mariadb-10.4.19.ebuild index ca2d2d41378d..f92c3cf86a74 100644 --- a/dev-db/mariadb/mariadb-10.4.19.ebuild +++ b/dev-db/mariadb/mariadb-10.4.19.ebuild @@ -369,12 +369,14 @@ src_configure() { ) if use server ; then - - # Federated{,X} must be treated special otherwise they will not be built as plugins + # Connect and Federated{,X} must be treated special + # otherwise they will not be built as plugins if ! use extraengine ; then mycmakeargs+=( + -DPLUGIN_CONNECT=NO -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) + -DPLUGIN_FEDERATEDX=NO + ) fi mycmakeargs+=( @@ -387,7 +389,6 @@ src_configure() { -DPLUGIN_CASSANDRA=NO -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) -DCONNECT_WITH_MYSQL=1 -DCONNECT_WITH_LIBXML2=$(usex xml) -DCONNECT_WITH_ODBC=$(usex odbc) @@ -466,7 +467,6 @@ src_configure() { -DWITH_MYISAM_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 ) - else mycmakeargs+=( -DWITHOUT_SERVER=1 diff --git a/dev-db/mariadb/mariadb-10.5.10.ebuild b/dev-db/mariadb/mariadb-10.5.10.ebuild index ecedb5844ba3..8d6b3bc32fa6 100644 --- a/dev-db/mariadb/mariadb-10.5.10.ebuild +++ b/dev-db/mariadb/mariadb-10.5.10.ebuild @@ -365,10 +365,11 @@ src_configure() { ) if use server ; then - - # Federated{,X} must be treated special otherwise they will not be built as plugins + # Connect and Federated{,X} must be treated special + # otherwise they will not be built as plugins if ! use extraengine ; then mycmakeargs+=( + -DPLUGIN_CONNECT=NO -DPLUGIN_FEDERATED=NO -DPLUGIN_FEDERATEDX=NO ) @@ -385,7 +386,6 @@ src_configure() { -DPLUGIN_SPIDER=$(usex extraengine YES NO) -DPLUGIN_S3=$(usex s3 YES NO) -DPLUGIN_COLUMNSTORE=$(usex columnstore YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) -DCONNECT_WITH_MYSQL=1 -DCONNECT_WITH_LIBXML2=$(usex xml) -DCONNECT_WITH_ODBC=$(usex odbc) @@ -461,7 +461,6 @@ src_configure() { -DWITH_MYISAM_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 ) - else mycmakeargs+=( -DWITHOUT_SERVER=1 |