From ce3044ec1b68a65e41b030e120ae0213dc24cda8 Mon Sep 17 00:00:00 2001 From: Marcelo Gutierrez Date: Wed, 12 Feb 2014 22:39:34 +0000 Subject: [PATCH] mysql: fix debugging options The usual --{en,dis}able-debug passed by the infrastructure are not recognised by mysql's ./configure, as it uses unusual options. Also, debugging is only meaningful to the server, not the client. Signed-off-by: Marcelo Gutierrez (UTN/FRH) [yann.morin.1998@free.fr: actually add the options, move in server if-block] Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/mysql/mysql.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk index 27afc9f864..95b30b7011 100644 --- a/package/mysql/mysql.mk +++ b/package/mysql/mysql.mk @@ -30,8 +30,7 @@ MYSQL_CONF_OPT = \ --without-libedit \ --without-readline \ --with-low-memory \ - --enable-thread-safe-client \ - $(ENABLE_DEBUG) + --enable-thread-safe-client ifeq ($(BR2_PACKAGE_MYSQL_SERVER),y) MYSQL_DEPENDENCIES += host-mysql host-bison @@ -57,6 +56,14 @@ MYSQL_CONF_OPT += \ --without-plugin-innodb_plugin \ --without-plugin-ndbcluster +# Debugging is only available for the server, so no need for +# this if-block outside of the server if-block +ifeq ($(BR2_ENABLE_DEBUG),y) +MYSQL_CONF_OPT += --with-debug=full +else +MYSQL_CONF_OPT += --without-debug +endif + define HOST_MYSQL_BUILD_CMDS $(MAKE) -C $(@D)/include my_config.h $(MAKE) -C $(@D)/mysys libmysys.a -- 2.30.2