| Message ID | 20190117181608.12644-3-ps.report@gmx.net |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v5,1/4] libopenssl: bump version to 1.1.1a | expand |
Peter, On 1/17/2019 10:16 AM, Peter Seiderer wrote: > - change WITH_SSL for host build from bundled to system (and add > host-openssl dependency) to avoid the following configure failure: > > CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:137 (message): > Could NOT find GnuTLS (missing: GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR) > (Required is at least version "3.3.24") > Call Stack (most recent call first): > /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE) > /usr/share/cmake/Modules/FindGnuTLS.cmake:54 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) > libmariadb/CMakeLists.txt:298 (FIND_PACKAGE) > > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > --- > Note: > - WITH_SSL related bug report, see [1] > > Changes v4 -> v5: > - new patch (suggested by Ryan Coe) > > [1] https://jira.mariadb.org/browse/MDEV-16014 > --- > package/mariadb/mariadb.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk > index e17649209a..e354a9137c 100644 > --- a/package/mariadb/mariadb.mk > +++ b/package/mariadb/mariadb.mk > @@ -86,7 +86,8 @@ MARIADB_CONF_OPTS += \ > -DMYSQL_DATADIR=/var/lib/mysql \ > -DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET) > > -HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF > +HOST_MARIADB_DEPENDENCIES = host-openssl > +HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system > > # Some helpers must be compiled for host in order to crosscompile mariadb for > # the target. They are then included by import_executables.cmake which is Tested-by: Ryan Coe <bluemrp9@gmail.com>
diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index e17649209a..e354a9137c 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -86,7 +86,8 @@ MARIADB_CONF_OPTS += \ -DMYSQL_DATADIR=/var/lib/mysql \ -DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET) -HOST_MARIADB_CONF_OPTS += -DWITH_SSL=OFF +HOST_MARIADB_DEPENDENCIES = host-openssl +HOST_MARIADB_CONF_OPTS += -DWITH_SSL=system # Some helpers must be compiled for host in order to crosscompile mariadb for # the target. They are then included by import_executables.cmake which is
- change WITH_SSL for host build from bundled to system (and add host-openssl dependency) to avoid the following configure failure: CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:137 (message): Could NOT find GnuTLS (missing: GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR) (Required is at least version "3.3.24") Call Stack (most recent call first): /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:378 (_FPHSA_FAILURE_MESSAGE) /usr/share/cmake/Modules/FindGnuTLS.cmake:54 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) libmariadb/CMakeLists.txt:298 (FIND_PACKAGE) Signed-off-by: Peter Seiderer <ps.report@gmx.net> --- Note: - WITH_SSL related bug report, see [1] Changes v4 -> v5: - new patch (suggested by Ryan Coe) [1] https://jira.mariadb.org/browse/MDEV-16014 --- package/mariadb/mariadb.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)