From b7a4a39f9a8bdbf7eaf548785e0dc371efcd5737 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 24 Feb 2024 20:52:59 +0000 Subject: [PATCH] mariadb: update build options hashicorp, jdbc, oqgraph, s3; all rely on libcurl. when building mariadb against curl compiled with configure, curl is NOT FOUND. when curl is built with cmake, curl is FOUND. keep consistent with not building; hashicorp, jdbc, oqgraph, s3. --- packages/addons/service/mariadb/package.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk index 1f93ddde92..a0b46b55d0 100644 --- a/packages/addons/service/mariadb/package.mk +++ b/packages/addons/service/mariadb/package.mk @@ -36,6 +36,7 @@ configure_package() { -DCMAKE_CROSSCOMPILING=ON \ -DIMPORT_EXECUTABLES=${PKG_BUILD}/.${HOST_NAME}/import_executables.cmake \ -DWITHOUT_AWS_KEY_MANAGEMENT=ON \ + -DWITHOUT_HASHICORP_KEY_MANAGEMENT=ON \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_SSL=system \ -DWITH_SSL=${SYSROOT_PREFIX}/usr \ @@ -45,6 +46,7 @@ configure_package() { -DWITH_ZLIB=bundled \ -DWITH_EDITLINE=bundled \ -DWITH_LIBEVENT=bundled \ + -DCONNECT_WITH_JDBC=OFF \ -DCONNECT_WITH_LIBXML2=bundled \ -DSKIP_TESTS=ON \ -DWITH_DEBUG=OFF \ @@ -54,6 +56,8 @@ configure_package() { -DWITH_EMBEDDED_SERVER=OFF \ -DWITHOUT_SERVER=OFF \ -DPLUGIN_AUTH_SOCKET=STATIC \ + -DPLUGIN_OQGRAPH=NO \ + -DPLUGIN_S3=NO \ -DDISABLE_SHARED=NO \ -DENABLED_PROFILING=OFF \ -DENABLE_STATIC_LIBS=OFF \