Commit 99fd373b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

package: fixup dependencies after mysql_client -> mysql rename 



Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent e2b2ecb6

package/collectd/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ config BR2_PACKAGE_COLLECTD_MYSQL 
	depends on BR2_INSTALL_LIBSTDCPP # mysql

	depends on BR2_USE_MMU # mysql

	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql

	select BR2_PACKAGE_MYSQL_CLIENT

	select BR2_PACKAGE_MYSQL

	help

	  Connects to a MySQL database and issues a "show status" command.

package/collectd/collectd.mk

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ COLLECTD_DEPENDENCIES = host-pkgconf \ 
	$(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \

	$(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \

	$(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \

	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql_client) \

	$(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \

	$(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \

	$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \

	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),protobuf-c) \
@@ -117,7 +117,7 @@ COLLECTD_DEPENDENCIES = host-pkgconf \ 
ifeq ($(BR2_PACKAGE_LIBCURL),y)

	COLLECTD_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr

endif

ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)

ifeq ($(BR2_PACKAGE_MYSQL),y)

	COLLECTD_CONF_OPT += --with-libmysql=$(STAGING_DIR)/usr

endif

ifeq ($(BR2_PACKAGE_NETSNMP),y)

package/cppdb/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ config BR2_PACKAGE_CPPDB 
	depends on BR2_INSTALL_LIBSTDCPP

	depends on BR2_TOOLCHAIN_HAS_THREADS

	# Can be built without them but it's useless

	depends on BR2_PACKAGE_MYSQL_CLIENT || BR2_PACKAGE_SQLITE

	depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_SQLITE

	help

	  CppDB is an SQL connectivity library that is designed to provide

	  platform and Database independent connectivity API similarly
@@ -12,5 +12,5 @@ config BR2_PACKAGE_CPPDB 
	  http://cppcms.com/sql/cppdb/



comment "cppdb needs a toolchain w/ C++, threads"

	depends on BR2_PACKAGE_MYSQL_CLIENT || BR2_PACKAGE_SQLITE

	depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_SQLITE

	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

package/cppdb/cppdb.mk

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) 
CPPDB_LICENSE = Boost-v1.0 or MIT

CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt



ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)

CPPDB_DEPENDENCIES += mysql_client

ifeq ($(BR2_PACKAGE_MYSQL),y)

CPPDB_DEPENDENCIES += mysql

CPPDB_CONF_OPT += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql

endif

package/linknx/linknx.mk

+2 −2
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ LINKNX_CONF_OPT = --without-lua --without-log4cpp --without-pth-test \ 


LINKNX_DEPENDENCIES = libpthsem



ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)

ifeq ($(BR2_PACKAGE_MYSQL),y)

LINKNX_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config

LINKNX_DEPENDENCIES += mysql_client

LINKNX_DEPENDENCIES += mysql

else

LINKNX_CONF_OPT += --without-mysql

endif