diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-03 22:41:29 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-11 22:48:13 +0100 |
commit | 665e13c85e1fd216499cdd335a88a4d1c20f175f (patch) | |
tree | 5ecc87c54905105b96cbe9891028ef8eb3d713b1 /package/ebtables | |
parent | 2d23d40279be39f70553974de11a5fc088622911 (diff) |
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/ebtables')
-rw-r--r-- | package/ebtables/ebtables.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/ebtables/ebtables.mk b/package/ebtables/ebtables.mk index 23c462874..99f936359 100644 --- a/package/ebtables/ebtables.mk +++ b/package/ebtables/ebtables.mk @@ -9,7 +9,7 @@ EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(subst .,-,$(EBTABLES_VERSION)) EBTABLES_LICENSE = GPLv2+ EBTABLES_LICENSE_FILES = COPYING -EBTABLES_STATIC = $(if $(BR2_PREFER_STATIC_LIB),static) +EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static) EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32) define EBTABLES_BUILD_CMDS @@ -17,7 +17,7 @@ define EBTABLES_BUILD_CMDS CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)" -C $(@D) endef -ifeq ($(BR2_PREFER_STATIC_LIB),y) +ifeq ($(BR2_STATIC_LIBS),y) define EBTABLES_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/static \ $(TARGET_DIR)/sbin/ebtables |