Commit 665e13c8 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent 2d23d402

Config.in

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ config BR2_ENABLE_SSP 
comment "enabling Stack Smashing Protection requires support in the toolchain"

	depends on !BR2_TOOLCHAIN_HAS_SSP



config BR2_PREFER_STATIC_LIB

config BR2_STATIC_LIBS

	bool "build statically linked applications, no dynamic libraries"

	help

	  Build all applications for the target statically linked.

Config.in.legacy

+12 −0
Original line number Diff line number Diff line
@@ -99,6 +99,18 @@ comment "----------------------------------------------------" 
endif



###############################################################################



comment "Legacy options removed in 2015.02"



config BR2_PREFER_STATIC_LIB

	bool "static library option renamed"

	select BR2_STATIC_LIBS

	help

	  The BR2_PREFER_STATIC_LIB was renamed to BR2_STATIC_LIBS. It

	  highlights the fact that the option no longer "prefers"

	  static libraries, but "enforces" static libraries (i.e

	  shared libraries are completely unused).



comment "Legacy options removed in 2014.11"



config BR2_x86_generic

arch/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ config BR2_BINFMT_FDPIC 
config BR2_BINFMT_FLAT

	bool "FLAT"

	depends on BR2_bfin || BR2_m68k

	select BR2_PREFER_STATIC_LIB

	select BR2_STATIC_LIBS

	help

	  FLAT binary is a relatively simple and lightweight executable format

	  based on the original a.out format. It is widely used in environment

docs/manual/adding-packages-cmake.txt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ typical packages will therefore only use a few of them. 


** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_DEBUG+;

** +CMAKE_INSTALL_PREFIX+;

** +BUILD_SHARED_LIBS+ is driven by +BR2_PREFER_STATIC_LIB+;

** +BUILD_SHARED_LIBS+ is driven by +BR2_STATIC_LIBS+;

** +BUILD_DOC+, +BUILD_DOCS+ are disabled;

** +BUILD_EXAMPLE+, +BUILD_EXAMPLES+ are disabled;

** +BUILD_TEST+, +BUILD_TESTS+, +BUILD_TESTING+ are disabled.

docs/manual/adding-packages-directory.txt

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ use in the comment. 
** Comment string: +wchar+



* dynamic library

** Dependency symbol: +!BR2_PREFER_STATIC_LIB+

** Dependency symbol: +!BR2_STATIC_LIBS+

** Comment string: +dynamic library+



==== Dependencies on a Linux kernel built by buildroot