summaryrefslogtreecommitdiffstats
path: root/package/lockdev/lockdev.mk
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-03 22:41:29 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-11 22:48:13 +0100
commit665e13c85e1fd216499cdd335a88a4d1c20f175f (patch)
tree5ecc87c54905105b96cbe9891028ef8eb3d713b1 /package/lockdev/lockdev.mk
parent2d23d40279be39f70553974de11a5fc088622911 (diff)
downloadbuildroot-665e13c85e1fd216499cdd335a88a4d1c20f175f.tar.gz
buildroot-665e13c85e1fd216499cdd335a88a4d1c20f175f.zip
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>
Diffstat (limited to 'package/lockdev/lockdev.mk')
-rw-r--r--package/lockdev/lockdev.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/lockdev/lockdev.mk b/package/lockdev/lockdev.mk
index 21755e0e0f..59561bad4f 100644
--- a/package/lockdev/lockdev.mk
+++ b/package/lockdev/lockdev.mk
@@ -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))
OpenPOWER on IntegriCloud