godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-04 06:10:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS

Browse Source 
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 <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
Thomas Petazzoni
2014-12-03 22:41:29 +01:00
parent 2d23d40279
commit 665e13c85e
232 changed files with 430 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/hostapd/Config.in
View File

@@ -16,12 +16,12 @@ if BR2_PACKAGE_HOSTAPD
config BR2_PACKAGE_HOSTAPD_EAP
bool "Enable EAP"
depends on !BR2_PREFER_STATIC_LIB
depends on !BR2_STATIC_LIBS
help
Enable support for EAP and RADIUS.
comment "hostapd EAP needs a toolchain w/ dynamic library"
depends on BR2_PREFER_STATIC_LIB
depends on BR2_STATIC_LIBS
config BR2_PACKAGE_HOSTAPD_WPS
bool "Enable WPS"

4
package/hostapd/hostapd.mk
View File

@@ -31,7 +31,7 @@ HOSTAPD_CONFIG_DISABLE =
# libnl-3 needs -lm (for rint) and -lpthread if linking statically
# And library order matters hence stick -lnl-3 first since it's appended
# in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing
ifeq ($(BR2_PREFER_STATIC_LIB),y)
ifeq ($(BR2_STATIC_LIBS),y)
HOSTAPD_LIBS += -lnl-3 -lm -lpthread
endif
@@ -42,7 +42,7 @@ endif
# Try to use openssl if it's already available
ifeq ($(BR2_PACKAGE_OPENSSL),y)
HOSTAPD_DEPENDENCIES += openssl
HOSTAPD_LIBS += $(if $(BR2_PREFER_STATIC_LIB),-lcrypto -lz)
HOSTAPD_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz)
HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
else
HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD