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/cppdb/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/cppdb') diff --git a/package/cppdb/Config.in b/package/cppdb/Config.in index 19c9419d49..9037a7a0c6 100644 --- a/package/cppdb/Config.in +++ b/package/cppdb/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_CPPDB bool "cppdb" # dlfcn.h - depends on !BR2_PREFER_STATIC_LIB + depends on !BR2_STATIC_LIBS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # Can be built without them but it's useless @@ -16,4 +16,4 @@ config BR2_PACKAGE_CPPDB comment "cppdb needs a toolchain w/ C++, threads, dynamic library" depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_PREFER_STATIC_LIB + BR2_STATIC_LIBS -- cgit v1.2.3