mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09: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/qt5/qt5base/Config.in
View File

@@ -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

4
package/qt5/qt5base/qt5base.mk
View File

@@ -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)

4
package/qt5/qt5connectivity/Config.in
View File

@@ -5,7 +5,7 @@ config BR2_PACKAGE_QT5CONNECTIVITY
select BR2_PACKAGE_QT5BASE_CONCURRENT
select BR2_PACKAGE_QT5BASE_DBUS
depends on !BR2_avr32 # bluez_utils
depends on !BR2_PREFER_STATIC_LIB # bluez_utils
depends on !BR2_STATIC_LIBS # bluez_utils
depends on BR2_USE_WCHAR # bluez_utils
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils
depends on BR2_USE_MMU # bluez_utils
@@ -19,4 +19,4 @@ config BR2_PACKAGE_QT5CONNECTIVITY
comment "qt5connectivity needs a toolchain w/ wchar, threads, dynamic library"
depends on !BR2_avr32 && BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

2
package/qt5/qt5declarative/qt5declarative.mk
View File

@@ -34,7 +34,7 @@ define QT5DECLARATIVE_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS

2
package/qt5/qt5enginio/qt5enginio.mk
View File

@@ -47,7 +47,7 @@ define QT5ENGINIO_INSTALL_TARGET_EXAMPLES
endef
endif
ifneq ($(BR2_PREFER_STATIC_LIB),y)
ifneq ($(BR2_STATIC_LIBS),y)
define QT5ENGINIO_INSTALL_TARGET_LIBS
cp -dpf $(STAGING_DIR)/usr/lib/libEnginio.so.* $(TARGET_DIR)/usr/lib
endef

2
package/qt5/qt5imageformats/qt5imageformats.mk
View File

@@ -30,7 +30,7 @@ define QT5IMAGEFORMATS_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
define QT5IMAGEFORMATS_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/*.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/
endef

2
package/qt5/qt5multimedia/qt5multimedia.mk
View File

@@ -39,7 +39,7 @@ define QT5MULTIMEDIA_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB
cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib

4
package/qt5/qt5quick1/Config.in
View File

@@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5QUICK1
select BR2_PACKAGE_QT5SCRIPT
select BR2_PACKAGE_QT5XMLPATTERNS
# This module does not support static linking
depends on !BR2_PREFER_STATIC_LIB
depends on !BR2_STATIC_LIBS
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
help
Qt is a cross-platform application and UI framework for
@@ -19,4 +19,4 @@ config BR2_PACKAGE_QT5QUICK1
comment "qt5quick1 needs a toolchain w/ dynamic library"
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
depends on BR2_PREFER_STATIC_LIB
depends on BR2_STATIC_LIBS

2
package/qt5/qt5script/qt5script.mk
View File

@@ -31,7 +31,7 @@ define QT5SCRIPT_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
define QT5SCRIPT_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Script*.so.* $(TARGET_DIR)/usr/lib
endef

2
package/qt5/qt5sensors/qt5sensors.mk
View File

@@ -35,7 +35,7 @@ define QT5SENSORS_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
define QT5SENSORS_INSTALL_TARGET_LIBS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Sensors.so.* $(TARGET_DIR)/usr/lib
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sensor* $(TARGET_DIR)/usr/lib/qt/plugins

2
package/qt5/qt5serialport/qt5serialport.mk
View File

@@ -31,7 +31,7 @@ define QT5SERIALPORT_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
define QT5SERIALPORT_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialPort.so.* $(TARGET_DIR)/usr/lib
endef

2
package/qt5/qt5svg/qt5svg.mk
View File

@@ -37,7 +37,7 @@ define QT5SVG_INSTALL_ICONENGINES
endef
endif
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
define QT5SVG_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Svg*.so.* $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/libqsvg.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/

2
package/qt5/qt5webkit/Config.in
View File

@@ -7,7 +7,7 @@ config BR2_PACKAGE_QT5WEBKIT
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
# This module does not support static linking
depends on !BR2_PREFER_STATIC_LIB
depends on !BR2_STATIC_LIBS
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
help
Qt is a cross-platform application and UI framework for

2
package/qt5/qt5websockets/qt5websockets.mk
View File

@@ -47,7 +47,7 @@ define QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES
endef
endif
ifneq ($(BR2_PREFER_STATIC_LIB),y)
ifneq ($(BR2_STATIC_LIBS),y)
define QT5WEBSOCKETS_INSTALL_TARGET_LIBS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebSockets.so.* $(TARGET_DIR)/usr/lib
endef

2
package/qt5/qt5x11extras/qt5x11extras.mk
View File

@@ -31,7 +31,7 @@ define QT5X11EXTRAS_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
define QT5X11EXTRAS_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5X11Extras.so.* $(TARGET_DIR)/usr/lib
endef

2
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
View File

@@ -31,7 +31,7 @@ define QT5XMLPATTERNS_INSTALL_STAGING_CMDS
$(QT5_LA_PRL_FILES_FIXUP)
endef
ifeq ($(BR2_PREFER_STATIC_LIB),)
ifeq ($(BR2_STATIC_LIBS),)
define QT5XMLPATTERNS_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libQt5XmlPatterns*.so.* $(TARGET_DIR)/usr/lib
endef