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/stress/stress.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/stress') diff --git a/package/stress/stress.mk b/package/stress/stress.mk index b1536c05b8..4bb801e874 100644 --- a/package/stress/stress.mk +++ b/package/stress/stress.mk @@ -15,12 +15,12 @@ STRESS_AUTORECONF = YES # SHARED_STATIC_LIBS_OPTS to tell packages to build static libraries, # if supported. # -# If the BR2_PREFER_STATIC_LIB is not defined, we have to specify +# If the BR2_STATIC_LIBS is not defined, we have to specify # --disable-static explicitly to get stress linked dynamically. # # Also, disable documentation by undefining makeinfo STRESS_CONF_OPTS = \ - $(if $(BR2_PREFER_STATIC_LIB),,--disable-static) \ + $(if $(BR2_STATIC_LIBS),,--disable-static) \ MAKEINFO=: $(eval $(autotools-package)) -- cgit v1.2.1