From 665e13c85e1fd216499cdd335a88a4d1c20f175f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 3 Dec 2014 22:41:29 +0100 Subject: Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed from "prefer static libraries when possible" to "use only static libraries". The former semantic didn't make much sense, since the user had absolutely no control/idea of which package would use static libraries, and which packages would not. Therefore, for quite some time, we have been starting to enforce that BR2_PREFER_STATIC_LIB should really build everything with static libraries. As a consequence, this patch renames BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS, and adjust the Config.in option accordingly. This also helps preparing the addition of other options to select shared, shared+static or just static. Note that we have verified that this commit can be reproduced by simply doing a global rename of BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- package/collectd/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'package/collectd') diff --git a/package/collectd/Config.in b/package/collectd/Config.in index 75c90d1393..c12dd5b46c 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_COLLECTD depends on BR2_USE_MMU depends on BR2_INET_IPV6 depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_PREFER_STATIC_LIB + depends on !BR2_STATIC_LIBS help collectd is a daemon which collects system performance statistics periodically and provides mechanisms to store @@ -59,7 +59,7 @@ config BR2_PACKAGE_COLLECTD_LOGFILE config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL bool "notify_email" - depends on !BR2_PREFER_STATIC_LIB # libesmtp + depends on !BR2_STATIC_LIBS # libesmtp select BR2_PACKAGE_LIBESMTP select BR2_PACKAGE_OPENSSL help @@ -67,7 +67,7 @@ config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL configured recipients. comment "notify_email needs a toolchain w/ dynamic library" - depends on BR2_PREFER_STATIC_LIB + depends on BR2_STATIC_LIBS config BR2_PACKAGE_COLLECTD_SYSLOG bool "syslog" @@ -454,5 +454,5 @@ endmenu endif comment "collectd needs a toolchain w/ IPv6, threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_PREFER_STATIC_LIB + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_STATIC_LIBS depends on BR2_USE_MMU -- cgit v1.2.1