package: fixup dependencies after mysql_client -> mysql rename
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
e2b2ecb691
commit
99fd373bf5
|
@ -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.
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -12,7 +12,7 @@ OPEN2300_BINS = open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 \
|
|||
histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MYSQL),y)
|
||||
OPEN2300_DEPENDENCIES += mysql_client
|
||||
OPEN2300_DEPENDENCIES += mysql
|
||||
OPEN2300_BINS += mysql2300 mysqlhistlog2300
|
||||
endif
|
||||
|
||||
|
|
|
@ -96,7 +96,7 @@ config BR2_PACKAGE_PHP_EXT_MYSQL
|
|||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # mysql
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
select BR2_PACKAGE_MYSQL
|
||||
help
|
||||
MySQL support
|
||||
|
||||
|
@ -105,7 +105,7 @@ config BR2_PACKAGE_PHP_EXT_MYSQLI
|
|||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # mysql
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
select BR2_PACKAGE_MYSQL
|
||||
select BR2_PACKAGE_PHP_EXT_MYSQL
|
||||
help
|
||||
MySQL Improved extension support
|
||||
|
@ -122,7 +122,7 @@ config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
|
|||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_MMU # mysql
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
select BR2_PACKAGE_MYSQL
|
||||
help
|
||||
PDO driver for MySQL
|
||||
|
||||
|
|
|
@ -133,11 +133,11 @@ endif
|
|||
### Native MySQL extensions
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y)
|
||||
PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += mysql_client
|
||||
PHP_DEPENDENCIES += mysql
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y)
|
||||
PHP_CONF_OPT += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config
|
||||
PHP_DEPENDENCIES += mysql_client
|
||||
PHP_DEPENDENCIES += mysql
|
||||
endif
|
||||
|
||||
### PDO
|
||||
|
@ -153,7 +153,7 @@ endif
|
|||
endif
|
||||
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
|
||||
PHP_CONF_OPT += --with-pdo-mysql=$(STAGING_DIR)/usr
|
||||
PHP_DEPENDENCIES += mysql_client
|
||||
PHP_DEPENDENCIES += mysql
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@ config BR2_PACKAGE_POCO_DATA_MYSQL
|
|||
bool "mysql"
|
||||
depends on BR2_USE_MMU # mysql
|
||||
select BR2_PACKAGE_POCO_DATA
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
select BR2_PACKAGE_MYSQL
|
||||
|
||||
endif # BR2_PACKAGE_POCO
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ POCO_DEPENDENCIES = zlib pcre \
|
|||
$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
|
||||
$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
|
||||
$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
|
||||
$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql_client)
|
||||
$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql)
|
||||
|
||||
POCO_OMIT = Data/ODBC PageCompiler \
|
||||
$(if $(BR2_PACKAGE_POCO_XML),,XML) \
|
||||
|
|
|
@ -6,7 +6,7 @@ menuconfig BR2_PACKAGE_QT_SQL_MODULE
|
|||
if BR2_PACKAGE_QT_SQL_MODULE
|
||||
config BR2_PACKAGE_QT_MYSQL
|
||||
bool "MySQL Driver"
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
select BR2_PACKAGE_MYSQL
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_READLINE
|
||||
depends on BR2_USE_MMU # mysql
|
||||
|
|
|
@ -341,7 +341,7 @@ QT_CONFIGURE_OPTS += -qt-sql-ibase
|
|||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
|
||||
QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
|
||||
QT_DEPENDENCIES += mysql_client
|
||||
QT_DEPENDENCIES += mysql
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_QT_ODBC),y)
|
||||
QT_CONFIGURE_OPTS += -qt-sql-odbc
|
||||
|
|
|
@ -53,7 +53,7 @@ config BR2_PACKAGE_QT5BASE_SQL
|
|||
if BR2_PACKAGE_QT5BASE_SQL
|
||||
config BR2_PACKAGE_QT5BASE_MYSQL
|
||||
bool "MySQL Plugin"
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
select BR2_PACKAGE_MYSQL
|
||||
select BR2_PACKAGE_NCURSES
|
||||
select BR2_PACKAGE_READLINE
|
||||
depends on BR2_USE_MMU # mysql
|
||||
|
|
|
@ -61,7 +61,7 @@ endif
|
|||
ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
|
||||
ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
|
||||
QT5BASE_DEPENDENCIES += mysql_client
|
||||
QT5BASE_DEPENDENCIES += mysql
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
|
||||
endif
|
||||
|
|
|
@ -38,7 +38,7 @@ config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE
|
|||
config BR2_PACKAGE_SCONESERVER_MYSQL
|
||||
bool "mysql"
|
||||
depends on BR2_USE_MMU # mysql
|
||||
select BR2_PACKAGE_MYSQL_CLIENT
|
||||
select BR2_PACKAGE_MYSQL
|
||||
help
|
||||
MySQL module for Sconeserver
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ else
|
|||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
|
||||
SCONESERVER_DEPENDENCIES += mysql_client
|
||||
SCONESERVER_DEPENDENCIES += mysql
|
||||
SCONESERVER_CONF_OPT += --with-mysql \
|
||||
--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
|
||||
|
|
|
@ -100,7 +100,7 @@ config BR2_PACKAGE_STRONGSWAN_STROKE
|
|||
|
||||
config BR2_PACKAGE_STRONGSWAN_SQL
|
||||
bool "Enable SQL database configuration backend"
|
||||
depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL_CLIENT
|
||||
depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
@ -64,7 +64,7 @@ STRONGSWAN_DEPENDENCIES += \
|
|||
ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
|
||||
STRONGSWAN_DEPENDENCIES += \
|
||||
$(if $(BR2_PACKAGE_SQLITE),sqlite) \
|
||||
$(if $(BR2_PACKAGE_MYSQL_CLIENT),mysql_client)
|
||||
$(if $(BR2_PACKAGE_MYSQL),mysql)
|
||||
endif
|
||||
|
||||
# Strongswan uses AC_LIB_PREFIX, which is relatively new.
|
||||
|
|
|
@ -17,9 +17,9 @@ ULOGD_LICENSE_FILES = COPYING
|
|||
|
||||
# DB backends need threads
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
ifeq ($(BR2_PACKAGE_MYSQL_CLIENT),y)
|
||||
ifeq ($(BR2_PACKAGE_MYSQL),y)
|
||||
ULOGD_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
|
||||
ULOGD_DEPENDENCIES += mysql_client
|
||||
ULOGD_DEPENDENCIES += mysql
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_SQLITE),y)
|
||||
ULOGD_DEPENDENCIES += sqlite
|
||||
|
|
Loading…
Reference in a new issue