mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-26 03:50:44 -09:00
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 <thomas.petazzoni@free-electrons.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
@@ -12,7 +12,7 @@ LOCKDEV_LICENSE = LGPLv2.1
|
||||
LOCKDEV_LICENSE_FILES = LICENSE
|
||||
LOCKDEV_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PREFER_STATIC_LIB),y)
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
define LOCKDEV_BUILD_CMDS
|
||||
$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) static
|
||||
endef
|
||||
@@ -21,7 +21,7 @@ define LOCKDEV_INSTALL_STAGING_CMDS
|
||||
$(MAKE1) basedir=$(STAGING_DIR)/usr -C $(@D) install_dev
|
||||
endef
|
||||
|
||||
else # BR2_PREFER_STATIC_LIB
|
||||
else # BR2_STATIC_LIBS
|
||||
|
||||
define LOCKDEV_BUILD_CMDS
|
||||
$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) static shared
|
||||
@@ -37,6 +37,6 @@ define LOCKDEV_INSTALL_TARGET_CMDS
|
||||
$(MAKE1) basedir=$(TARGET_DIR)/usr -C $(@D) install_run
|
||||
ln -sf liblockdev.$(LOCKDEV_VERSION).so $(TARGET_DIR)/usr/lib/liblockdev.so.1
|
||||
endef
|
||||
endif # BR2_PREFER_STATIC_LIB
|
||||
endif # BR2_STATIC_LIBS
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user