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/qt5/qt5base | |
| parent | 2d23d40279be39f70553974de11a5fc088622911 (diff) | |
| download | buildroot-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/qt5/qt5base')
| -rw-r--r-- | package/qt5/qt5base/Config.in | 4 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 6ea7301a9d..7b334b4bd5 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -251,12 +251,12 @@ config BR2_PACKAGE_QT5BASE_ICU config BR2_PACKAGE_QT5BASE_TSLIB bool "Enable Tslib support" - depends on !BR2_PREFER_STATIC_LIB # dlopen + depends on !BR2_STATIC_LIBS # dlopen select BR2_PACKAGE_TSLIB help This options enables the Tslib plugin comment "tslib support needs a toolchain w/ dynamic library" - depends on BR2_PREFER_STATIC_LIB + depends on BR2_STATIC_LIBS endif diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 788b2d78eb..a36359d4fc 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -34,7 +34,7 @@ else QT5BASE_CONFIGURE_OPTS += -release endif -ifeq ($(BR2_PREFER_STATIC_LIB),y) +ifeq ($(BR2_STATIC_LIBS),y) QT5BASE_CONFIGURE_OPTS += -static else # We apparently can't build both the shared and static variants of the @@ -236,7 +236,7 @@ define QT5BASE_INSTALL_TARGET_EXAMPLES fi endef -ifeq ($(BR2_PREFER_STATIC_LIB),y) +ifeq ($(BR2_STATIC_LIBS),y) define QT5BASE_INSTALL_TARGET_CMDS $(QT5BASE_INSTALL_TARGET_FONTS) $(QT5BASE_INSTALL_TARGET_EXAMPLES) |
