From: Frank Hunleth Date: Mon, 23 Jan 2017 19:47:17 +0000 (-0500) Subject: mariadb: explicitly disable dtrace detection X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06013d690bae911f5b74ec241106da696ffea100;p=buildroot.git mariadb: explicitly disable dtrace detection By default, mariadb's cmake script tries to detect dtrace support. On hosts that have dtrace installed, this incorrectly enables dtrace and causes compile errors. Signed-off-by: Frank Hunleth Signed-off-by: Peter Korsgaard --- diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index d667208cfa..2e7305ef34 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -43,6 +43,9 @@ MARIADB_CONF_OPTS += -DWITH_JEMALLOC=no -DWITHOUT_TOKUDB=1 # Make it explicit that we are cross-compiling MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1 +# Explicitly disable dtrace to avoid detection of a host version +MARIADB_CONF_OPTS += -DENABLE_DTRACE=0 + ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y) MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON else