Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 3 Dec 2014 21:41:29 +0000 (22:41 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 11 Dec 2014 21:48:13 +0000 (22:48 +0100)
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>
232 files changed:
Config.in
Config.in.legacy
arch/Config.in
docs/manual/adding-packages-cmake.txt
docs/manual/adding-packages-directory.txt
package/Config.in
package/Makefile.in
package/agentpp/Config.in
package/aiccu/aiccu.mk
package/aircrack-ng/Config.in
package/aircrack-ng/aircrack-ng.mk
package/alsa-lib/alsa-lib.mk
package/am335x-pru-package/am335x-pru-package.mk
package/apr-util/Config.in
package/apr/Config.in
package/avahi/Config.in
package/avrdude/Config.in
package/bash/bash.mk
package/bellagio/Config.in
package/bind/Config.in
package/bluez5_utils/Config.in
package/bluez_utils/Config.in
package/bmon/bmon.mk
package/boost/boost.mk
package/botan/botan.mk
package/btrfs-progs/btrfs-progs.mk
package/bustle/bustle.mk
package/busybox/busybox.mk
package/bzip2/bzip2.mk
package/canfestival/Config.in
package/ccid/Config.in
package/cegui06/Config.in
package/cifs-utils/cifs-utils.mk
package/cjson/Config.in
package/collectd/Config.in
package/connman/Config.in
package/cppcms/Config.in
package/cppdb/Config.in
package/cppunit/Config.in
package/crda/Config.in
package/crda/crda.mk
package/cryptsetup/Config.in
package/curlftpfs/Config.in
package/cwiid/Config.in
package/czmq/czmq.mk
package/dbus/dbus.mk
package/dhcpcd/dhcpcd.mk
package/dhcpdump/dhcpdump.mk
package/directfb/Config.in
package/directfb/directfb.mk
package/dmraid/Config.in
package/dnsmasq/dnsmasq.mk
package/dropbear/dropbear.mk
package/dtc/Config.in
package/dvb-apps/dvb-apps.mk
package/e2fsprogs/e2fsprogs.mk
package/ebtables/ebtables.mk
package/ecryptfs-utils/Config.in
package/efl/libedbus/Config.in
package/elfutils/Config.in
package/erlang/Config.in
package/eudev/Config.in
package/exfat/Config.in
package/exim/exim.mk
package/exiv2/Config.in
package/faifa/Config.in
package/fbv/fbv.mk
package/ffmpeg/ffmpeg.mk
package/flann/Config.in
package/fswebcam/Config.in
package/gawk/Config.in
package/gcc/gcc-final/gcc-final.mk
package/giblib/Config.in
package/gpm/Config.in
package/gptfdisk/gptfdisk.mk
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
package/gstreamer1/gst1-plugins-bad/Config.in
package/gstreamer1/gst1-plugins-ugly/Config.in
package/haserl/haserl.mk
package/heirloom-mailx/Config.in
package/hostapd/Config.in
package/hostapd/hostapd.mk
package/iftop/iftop.mk
package/imlib2/Config.in
package/inadyn/Config.in
package/ipsec-tools/ipsec-tools.mk
package/iptables/iptables.mk
package/iw/iw.mk
package/jimtcl/jimtcl.mk
package/kexec-lite/Config.in
package/keyutils/keyutils.mk
package/kmod/Config.in
package/knock/knock.mk
package/lftp/lftp.mk
package/libarchive/libarchive.mk
package/libbluray/Config.in
package/libcap/libcap.mk
package/libcec/Config.in
package/libcgi/libcgi.mk
package/libdvdnav/Config.in
package/libdvdread/Config.in
package/libebml/libebml.mk
package/libesmtp/Config.in
package/libfreefare/libfreefare.mk
package/libfuse/Config.in
package/libjson/libjson.mk
package/libmatroska/libmatroska.mk
package/libnl/Config.in
package/libnspr/libnspr.mk
package/libnss/Config.in
package/libphidget/Config.in
package/libpthread-stubs/libpthread-stubs.mk
package/libsepol/libsepol.mk
package/libshairplay/Config.in
package/libubox/Config.in
package/libuci/Config.in
package/libva-intel-driver/Config.in
package/libva/Config.in
package/lighttpd/Config.in
package/linux-pam/Config.in
package/live555/live555.mk
package/lm-sensors/lm-sensors.mk
package/lockdev/lockdev.mk
package/log4cxx/Config.in
package/ltrace/Config.in
package/lua/lua.mk
package/luajit/luajit.mk
package/lvm2/Config.in
package/lz4/lz4.mk
package/mesa3d/Config.in
package/mesa3d/mesa3d.mk
package/minidlna/minidlna.mk
package/mpd/Config.in
package/msmtp/msmtp.mk
package/ncurses/ncurses.mk
package/ne10/ne10.mk
package/netsnmp/netsnmp.mk
package/nftables/nftables.mk
package/ngrep/ngrep.mk
package/omniorb/omniorb.mk
package/openobex/Config.in
package/openssl/openssl.mk
package/openvmtools/Config.in
package/openvpn/openvpn.mk
package/p11-kit/Config.in
package/parted/parted.mk
package/pciutils/pciutils.mk
package/pcsc-lite/Config.in
package/perl-gd/Config.in
package/perl-gdgraph/Config.in
package/perl-io-socket-ssl/Config.in
package/perl-net-ssleay/Config.in
package/perl-xml-libxml/Config.in
package/perl/perl.mk
package/phidgetwebservice/Config.in
package/php/php.mk
package/pkg-cmake.mk
package/pkgconf/pkgconf.mk
package/pppd/Config.in
package/proxychains-ng/Config.in
package/ptpd2/ptpd2.mk
package/pure-ftpd/pure-ftpd.mk
package/python-pam/Config.in
package/qdecoder/Config.in
package/qhull/Config.in
package/qlibc/Config.in
package/qt/Config.in
package/qt5/qt5base/Config.in
package/qt5/qt5base/qt5base.mk
package/qt5/qt5connectivity/Config.in
package/qt5/qt5declarative/qt5declarative.mk
package/qt5/qt5enginio/qt5enginio.mk
package/qt5/qt5imageformats/qt5imageformats.mk
package/qt5/qt5multimedia/qt5multimedia.mk
package/qt5/qt5quick1/Config.in
package/qt5/qt5script/qt5script.mk
package/qt5/qt5sensors/qt5sensors.mk
package/qt5/qt5serialport/qt5serialport.mk
package/qt5/qt5svg/qt5svg.mk
package/qt5/qt5webkit/Config.in
package/qt5/qt5websockets/qt5websockets.mk
package/qt5/qt5x11extras/qt5x11extras.mk
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
package/rsh-redone/Config.in
package/rtmpdump/rtmpdump.mk
package/ruby/Config.in
package/sconeserver/Config.in
package/slang/slang.mk
package/smack/Config.in
package/snmppp/Config.in
package/snowball-hdmiservice/Config.in
package/snowball-init/Config.in
package/spice/Config.in
package/sqlite/sqlite.mk
package/sshfs/Config.in
package/stress/stress.mk
package/strongswan/Config.in
package/subversion/Config.in
package/systemd/Config.in
package/tcpdump/tcpdump.mk
package/thrift/thrift.mk
package/tinyalsa/Config.in
package/trace-cmd/Config.in
package/tslib/Config.in
package/uclibc/uclibc.mk
package/udisks/Config.in
package/ulogd/Config.in
package/unionfs/Config.in
package/ushare/Config.in
package/ussp-push/Config.in
package/util-linux/Config.in
package/vde2/Config.in
package/vlc/vlc.mk
package/wayland/Config.in
package/weston/Config.in
package/wireless_tools/Config.in
package/wpa_supplicant/wpa_supplicant.mk
package/wvstreams/wvstreams.mk
package/x11r7/Config.in
package/x11r7/xdriver_xf86-input-tslib/Config.in
package/x264/x264.mk
package/xbmc/Config.in
package/xl2tp/xl2tp.mk
package/xmlstarlet/xmlstarlet.mk
package/zeromq/zeromq.mk
package/zlib/zlib.mk
package/zlog/Config.in
support/scripts/scancpan
system/Config.in
toolchain/toolchain-buildroot/Config.in
toolchain/toolchain-external/Config.in
toolchain/toolchain-external/toolchain-external.mk

index 3374e0fe2cbd7b71a7a3e7d6696d6fa8949457a2..cdc5f0f9facd50c926da1dce05fe5b9b5872aaa2 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -525,7 +525,7 @@ config BR2_ENABLE_SSP
 comment "enabling Stack Smashing Protection requires support in the toolchain"
        depends on !BR2_TOOLCHAIN_HAS_SSP
 
-config BR2_PREFER_STATIC_LIB
+config BR2_STATIC_LIBS
        bool "build statically linked applications, no dynamic libraries"
        help
          Build all applications for the target statically linked.
index b12655643b845ee4d41a5a77554ca319d07cd726..09c025cc991858ca34bc31568a8ad9d22ec2f89a 100644 (file)
@@ -99,6 +99,18 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+
+comment "Legacy options removed in 2015.02"
+
+config BR2_PREFER_STATIC_LIB
+       bool "static library option renamed"
+       select BR2_STATIC_LIBS
+       help
+         The BR2_PREFER_STATIC_LIB was renamed to BR2_STATIC_LIBS. It
+         highlights the fact that the option no longer "prefers"
+         static libraries, but "enforces" static libraries (i.e
+         shared libraries are completely unused).
+
 comment "Legacy options removed in 2014.11"
 
 config BR2_x86_generic
index d62d8872b3f3aacc25ef089deeede37f726bc132..2779ab60cde124470184bde6bb3b98675d9d8446 100644 (file)
@@ -277,7 +277,7 @@ config BR2_BINFMT_FDPIC
 config BR2_BINFMT_FLAT
        bool "FLAT"
        depends on BR2_bfin || BR2_m68k
-       select BR2_PREFER_STATIC_LIB
+       select BR2_STATIC_LIBS
        help
          FLAT binary is a relatively simple and lightweight executable format
          based on the original a.out format. It is widely used in environment
index 097cf6301b30cdc7134ad0a068b0d48a4de2e3d9..d92b2090f879d94454bd3a3f2998291771f4b3d8 100644 (file)
@@ -102,7 +102,7 @@ typical packages will therefore only use a few of them.
 
 ** +CMAKE_BUILD_TYPE+ is driven by +BR2_ENABLE_DEBUG+;
 ** +CMAKE_INSTALL_PREFIX+;
-** +BUILD_SHARED_LIBS+ is driven by +BR2_PREFER_STATIC_LIB+;
+** +BUILD_SHARED_LIBS+ is driven by +BR2_STATIC_LIBS+;
 ** +BUILD_DOC+, +BUILD_DOCS+ are disabled;
 ** +BUILD_EXAMPLE+, +BUILD_EXAMPLES+ are disabled;
 ** +BUILD_TEST+, +BUILD_TESTS+, +BUILD_TESTING+ are disabled.
index 0ea03f9153a6b25e105693b9fad2015f2c53911b..de03271cd06a91b0cf9e4a5e345333c81e807756 100644 (file)
@@ -271,7 +271,7 @@ use in the comment.
 ** Comment string: +wchar+
 
 * dynamic library
-** Dependency symbol: +!BR2_PREFER_STATIC_LIB+
+** Dependency symbol: +!BR2_STATIC_LIBS+
 ** Comment string: +dynamic library+
 
 ==== Dependencies on a Linux kernel built by buildroot
index f41e3326d7e2c8c39ae75ae1ec0daf59b3ab2e36..06bf412050d019a8e1f7f9deb1eb813142b83feb 100644 (file)
@@ -400,7 +400,7 @@ menu "Interpreter languages and scripting"
        source "package/lua/Config.in"
        source "package/luainterpreter/Config.in"
        source "package/luajit/Config.in"
-if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_PREFER_STATIC_LIB
+if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_STATIC_LIBS
 # lua modules are dynamically loaded, so not available on static builds
 menu "Lua libraries/modules"
        source "package/cgilua/Config.in"
@@ -465,7 +465,7 @@ endmenu
 endif
        source "package/php/Config.in"
 if BR2_PACKAGE_PHP
-if !BR2_PREFER_STATIC_LIB
+if !BR2_STATIC_LIBS
 menu "External php extensions"
        source "package/php-geoip/Config.in"
        source "package/php-gnupg/Config.in"
@@ -476,7 +476,7 @@ menu "External php extensions"
        source "package/php-zmq/Config.in"
 endmenu
 endif
-if BR2_PREFER_STATIC_LIB
+if BR2_STATIC_LIBS
 comment "External PHP extensions need a toolchain w/ dynamic library"
 endif
 endif
index f60b08dde4e88440cd35f7958e33570ee1724280..50f86ad34a82237c0380517ca3c16068ac4c7d45 100644 (file)
@@ -389,7 +389,7 @@ else
 ENABLE_DEBUG := --disable-debug
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 SHARED_STATIC_LIBS_OPTS = --enable-static --disable-shared
 TARGET_CFLAGS += -static
 TARGET_CXXFLAGS += -static
index 8fd6c0d507af7f2ac38e3df498779ab6dae70478..4b70a1a738f0519f240c6f456dc49a19b1563df4 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_AGENTPP
        select BR2_PACKAGE_SNMPPP
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS # snmp++
-       depends on !BR2_PREFER_STATIC_LIB # snmp++
+       depends on !BR2_STATIC_LIBS # snmp++
        help
          AGENT++ is a set of C++ classes which provides a complete protocol
          engine and dispatch table for the development of SNMP agents.
@@ -19,4 +19,4 @@ config BR2_PACKAGE_AGENTPP
 
 comment "agent++ needs a toolchain w/ threads, C++, dynamic library"
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index faa861cf37cf140415b5d001b54fdfd688793c8e..f2cd3dee7497b03906682af9723d25a528c44a5a 100644 (file)
@@ -15,7 +15,7 @@ AICCU_LFDLAGS = $(TARGET_LDFLAGS)
 
 # aiccu forgets to link with gnutls' dependencies breaking the build when
 # linking statically
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 AICCU_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --static --libs gnutls)
 endif
 
index d254e21ce2bb10198a474677524317e22697a82d..80b3a2b1c8526878b32062fef6e05daa1b791b25 100644 (file)
@@ -4,7 +4,7 @@ config BR2_PACKAGE_AIRCRACK_NG
        depends on BR2_USE_MMU # uses fork()
        # libnl has issues when linking statically
        # they need fixing in libnl itself
-       select BR2_PACKAGE_LIBNL if !BR2_PREFER_STATIC_LIB
+       select BR2_PACKAGE_LIBNL if !BR2_STATIC_LIBS
        select BR2_PACKAGE_OPENSSL
        select BR2_PACKAGE_ZLIB
        depends on BR2_TOOLCHAIN_HAS_THREADS
index c7fcb63d54882626e15e7ea327cb419925133ac2..fff4137be50ded67dc2d6ad92718095b39157afa 100644 (file)
@@ -14,10 +14,10 @@ AIRCRACK_NG_MAKE_OPTS = unstable=true
 
 # Account for libpthread in static
 AIRCRACK_NG_LDFLAGS = $(TARGET_LDFLAGS) \
-       $(if $(BR2_PREFER_STATIC_LIB),-lpthread -lz)
+       $(if $(BR2_STATIC_LIBS),-lpthread -lz)
 
 # libnl support has issues when building static
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        AIRCRACK_NG_MAKE_OPTS += libnl=false
 else
        AIRCRACK_NG_MAKE_OPTS += libnl=true
@@ -27,7 +27,7 @@ endif
 ifeq ($(BR2_PACKAGE_LIBPCAP),y)
        AIRCRACK_NG_DEPENDENCIES += libpcap
        AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=yes \
-               $(if $(BR2_PREFER_STATIC_LIB),LIBPCAP="-lpcap $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)")
+               $(if $(BR2_STATIC_LIBS),LIBPCAP="-lpcap $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)")
 else
        AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=no
 endif
@@ -42,7 +42,7 @@ endif
 # Duplicate -lpthread, because it is also needed by sqlite
 ifeq ($(BR2_PACKAGE_SQLITE),y)
        AIRCRACK_NG_DEPENDENCIES += sqlite
-       AIRCRACK_NG_MAKE_OPTS += sqlite=true LIBSQL="-lsqlite3 $(if $(BR2_PREFER_STATIC_LIB),-lpthread)"
+       AIRCRACK_NG_MAKE_OPTS += sqlite=true LIBSQL="-lsqlite3 $(if $(BR2_STATIC_LIBS),-lpthread)"
 else
        AIRCRACK_NG_MAKE_OPTS += sqlite=false
 endif
index 0b329cd4b43aa38e251a18eb2a469fa660ef3112..2890a38cae17f8d65214275d64159ebe36eaf272 100644 (file)
@@ -18,7 +18,7 @@ ALSA_LIB_CONF_OPTS = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEV
                    --without-versioned
 
 # Can't build with static & shared at the same time (1.0.25+)
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 ALSA_LIB_CONF_OPTS += --enable-shared=no
 else
 ALSA_LIB_CONF_OPTS += --enable-static=no
index 1e4fc0d391d2f751a865a7caeb324f6077b83c1a..a4ff201c21db69322a3dcd1bb1b12cb3bcfd84b2 100644 (file)
@@ -13,9 +13,9 @@ AM335X_PRU_PACKAGE_INSTALL_STAGING = YES
 
 # The default 'all' rule builds everything, when we just need the library
 ifeq ($(BR2_ENABLE_DEBUG),y)
-AM335X_MAKE_TARGET = debug $(if $(BR2_PREFER_STATIC_LIB),,sodebug)
+AM335X_MAKE_TARGET = debug $(if $(BR2_STATIC_LIBS),,sodebug)
 else
-AM335X_MAKE_TARGET = release $(if $(BR2_PREFER_STATIC_LIB),,sorelease)
+AM335X_MAKE_TARGET = release $(if $(BR2_STATIC_LIBS),,sorelease)
 endif
 
 define AM335X_PRU_PACKAGE_BUILD_CMDS
@@ -44,7 +44,7 @@ define AM335X_PRU_PACKAGE_LN_DEBUG_STAGING_STATIC
 endef
 AM335X_PRU_PACKAGE_POST_INSTALL_STAGING_HOOKS += AM335X_PRU_PACKAGE_LN_DEBUG_STAGING_STATIC
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 
 define AM335X_PRU_PACKAGE_LN_DEBUG_STAGING_SHARED
        ln -sf libprussdrvd.so $(STAGING_DIR)/usr/lib/libprussdrv.so
index 6757e7e21f1df13046f82712626d2a60cd088149..1d7db2bd771df45327569e34062c8fde28d7466e 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_APR_UTIL
        select BR2_PACKAGE_APR
        select BR2_PACKAGE_EXPAT
        # apr really needs shared library support
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU # apr
        help
          The utility library for the apache runtime project
@@ -12,4 +12,4 @@ config BR2_PACKAGE_APR_UTIL
 
 comment "apr-util needs a toolchain w/ dynamic library"
        depends on BR2_USE_MMU
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index fcfffec388654c8b5263968fce6db39fbd29d485..5757272450646d5f62ff7c1e3b72cc439d1c699d 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_APR
        bool "apr"
        # apr really needs shared library support
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU # fork() in apr_proc_fork()
        help
          The mission of the Apache Portable Runtime (APR) project is to create
@@ -12,4 +12,4 @@ config BR2_PACKAGE_APR
 
 comment "apr needs a toolchain w/ dynamic library"
        depends on BR2_USE_MMU
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index b52cc78ce510cc345ac7dc1c1096f27a2d9c3a6c..a6b4ac83f1592cbb07917f5019df640cefd12ec1 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_AVAHI
        # libdaemon uses fork()
        depends on BR2_USE_MMU
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        help
          Avahi is a system which facilitates service
index 84bd091dd991aaf5cf64fc278fa16a405329ad7a..f090ac673ff4cfecfd3a849250a862661b40f864 100644 (file)
@@ -7,7 +7,7 @@ config BR2_PACKAGE_AVRDUDE
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_LARGEFILE # elfutils
        depends on BR2_USE_WCHAR # elfutils
-       depends on !BR2_PREFER_STATIC_LIB # elfutils
+       depends on !BR2_STATIC_LIBS # elfutils
        depends on !BR2_avr32 # elfutils
        depends on !BR2_bfin # elfutils
        help
@@ -17,6 +17,6 @@ config BR2_PACKAGE_AVRDUDE
          https://github.com/kcuzner/avrdude
 
 comment "avrdude needs a toolchain w/ threads, largefile, wchar, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
        depends on !BR2_avr32
        depends on !BR2_bfin
index c44a98625650033f139bb38381b34641b46b0a97..9865e1971d76896e434a4368f8859183cd4c79d3 100644 (file)
@@ -26,7 +26,7 @@ BASH_CONF_ENV += \
 BASH_MAKE = $(MAKE1)
 
 # The static build needs some trickery
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 BASH_CONF_OPTS += --enable-static-link --without-bash-malloc
 # bash wants to redefine the getenv() function. To check whether this is
 # possible, AC_TRY_RUN is used which is not possible in
index ee87e130585a4bee3bc2e258e1113d9d3f73d30b..8ad18673990b51170ab715f2b49d8f7d5cc4f1f3 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_BELLAGIO
        bool "bellagio"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_HAS_LIBOPENMAX
        help
          Bellagio is an opensource implementation of the
@@ -25,4 +25,4 @@ config BR2_PACKAGE_PROVIDES_LIBOPENMAX
 endif
 
 comment "bellagio needs a toolchain w/ C++, threads, dynamic library"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index 8e3b8242871a87b5b18c19d6afc113428cd25370..ba7127064a104c59f8a3f686503cf9842e3e3c84 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_BIND
        depends on BR2_INET_IPV6
        depends on BR2_LARGEFILE
        depends on BR2_USE_MMU # fork()
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          BIND (Berkeley Internet Name Domain) is an implementation of
          the Domain Name System (DNS) protocols and provides an openly
@@ -41,4 +41,4 @@ endif
 
 comment "bind needs a toolchain w/ largefile, IPv6, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || !BR2_INET_IPV6 || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_INET_IPV6 || BR2_STATIC_LIBS
index a374f921d94d78492670d9dd623f06c411b16556..a7cd55eb9a5f5008fcf5e178050bf7bc8d0fdfbb 100644 (file)
@@ -5,7 +5,7 @@ config BR2_PACKAGE_BLUEZ5_UTILS
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus
        depends on BR2_INET_IPV6
-       depends on !BR2_PREFER_STATIC_LIB # uses dlfcn
+       depends on !BR2_STATIC_LIBS # uses dlfcn
        depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
        select BR2_PACKAGE_DBUS
@@ -66,7 +66,7 @@ endif
 comment "bluez5-utils needs a toolchain w/ wchar, threads, IPv6, headers >= 3.4, dynamic library"
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
                !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
        depends on BR2_USE_MMU
 
 comment "bluez5-utils conflicts with older bluez-utils version"
index 9efd83df6c501ad6901aa1fdd5d85e8d7e9088eb..c4760b29a3eca812696699dc9c83f7a61bb8fd86 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_BLUEZ_UTILS
        bool "bluez-utils"
        depends on !BR2_avr32
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus, libglib2
@@ -48,4 +48,4 @@ endif
 
 comment "bluez-utils 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
index 99f074bbd88f3c14c7eb6ecbfa425b9beec501ba..c89de17d116f85f0d14363af06ace507dc5e9c12 100644 (file)
@@ -13,7 +13,7 @@ BMON_LICENSE_FILES = LICENSE
 BMON_AUTORECONF = YES
 
 # link dynamically unless explicitly requested otherwise
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 BMON_CONF_OPTS += --disable-static
 else
 # forgets to explicitly link with pthread for libnl
index 275ee00456e0cc2dd03eebe5d64aea8a14599532..725463c2445a36d3c261fbdc3093066ae7240176 100644 (file)
@@ -92,8 +92,8 @@ BOOST_OPTS += toolset=gcc \
             threading=multi \
             abi=$(BOOST_ABI) \
             variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
-            link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
-            runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared)
+            link=$(if $(BR2_STATIC_LIBS),static,shared) \
+            runtime-link=$(if $(BR2_STATIC_LIBS),static,shared)
 
 ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y)
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
index 2e47eb6e879bf3c5a20b7e75d347565c6be7c18f..9c41c9bd694180be18a89fe1a3aae6c09751ed97 100644 (file)
@@ -19,7 +19,7 @@ BOTAN_CONF_OPTS = \
        --cc=gcc \
        --cc-bin="$(TARGET_CXX)"
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        BOTAN_CONF_OPTS += --disable-shared --no-autoload
 endif
 
index ec54746bf036de2b8eaa5e144e3835fd11603ea9..6a1b7ea2f675c48d63d3dc8d6fcad4d91c6d7519 100644 (file)
@@ -14,7 +14,7 @@ BTRFS_PROGS_LICENSE = GPLv2
 BTRFS_PROGS_LICENSE_FILES = COPYING
 
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 BTRFS_PROGS_MAKE_TARGET = static
 BTRFS_PROGS_MAKE_INSTALL_TARGET = install-static
 ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
index 9943db5a9ba2d53d0312f2101910ad1ff16a5314..1ba36e0a69c1869e950b3f7d44956141d3693dbd 100644 (file)
@@ -11,7 +11,7 @@ BUSTLE_LICENSE_FILES = LICENSE
 BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf
 
 BUSTLE_PCAP_FLAGS = "-lpcap"
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 BUSTLE_PCAP_FLAGS += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)
 endif
 
index 9fb389d24fa9004cf30754d8603c309f95707196..2e55aec218e50feb1e6f34749538a17286727ad2 100644 (file)
@@ -118,7 +118,7 @@ endef
 endif
 
 # If we're using static libs do the same for busybox
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 define BUSYBOX_PREFER_STATIC
        $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG))
 endef
index 7584694802a0fc28ac97c1c08484518373baf46f..0597ab97d620b4db383e8c2bd6b0ff09ab51217d 100644 (file)
@@ -10,7 +10,7 @@ BZIP2_INSTALL_STAGING = YES
 BZIP2_LICENSE = bzip2 license
 BZIP2_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 define BZIP2_BUILD_SHARED_CMDS
        $(TARGET_MAKE_ENV)
                $(MAKE) -C $(@D) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS)
@@ -23,7 +23,7 @@ define BZIP2_BUILD_CMDS
        $(BZIP2_BUILD_SHARED_CMDS)
 endef
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 define BZIP2_INSTALL_STAGING_SHARED_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) \
                -f Makefile-libbz2_so PREFIX=$(STAGING_DIR)/usr -C $(@D) install
@@ -36,7 +36,7 @@ define BZIP2_INSTALL_STAGING_CMDS
        $(BZIP2_INSTALL_STAGING_SHARED_CMDS)
 endef
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 define BZIP2_INSTALL_TARGET_SHARED_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) \
                -f Makefile-libbz2_so PREFIX=$(TARGET_DIR)/usr -C $(@D) install
index d2bfaca3cea2601e96e547cb6e1a5fcbcf01d280..7c7b370de01298ff7311168ba517b1bcbffb5bd7 100644 (file)
@@ -4,13 +4,13 @@ config BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
 
 comment "canfestival needs a toolchain w/ threads and dynamic library"
        depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_CANFESTIVAL
        bool "canfestival"
        depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          CanFestival is an OpenSource CANOpen framework, licensed under
          LGPLv2.1 and GPLv2 for some drivers (virtual_kernel, lincan and
index e3c71f84ef841c55ca78f00887268c43270afc40..f5bb5830bbc4d4dcc4e6c0507c39eddda712c24e 100644 (file)
@@ -4,7 +4,7 @@ config BR2_PACKAGE_CCID
        select BR2_PACKAGE_LIBUSB
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
        depends on BR2_USE_MMU # pcsc-lite
-       depends on !BR2_PREFER_STATIC_LIB # pcsc-lite
+       depends on !BR2_STATIC_LIBS # pcsc-lite
        help
          PC/SC driver for USB CCID smart card readers
 
@@ -12,4 +12,4 @@ config BR2_PACKAGE_CCID
 
 comment "ccid needs a toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index f03e4884b4b30ca773c142b1283b425483b59fad..e6a024a3995643bcc6b275889cc5989d279bebf4 100644 (file)
@@ -1,11 +1,11 @@
 comment "cegui06 needs a toolchain w/ C++, threads, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_CEGUI06
        bool "cegui06"
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_EXPAT
        select BR2_PACKAGE_FREETYPE
        select BR2_PACKAGE_PCRE
index 0fbde0e603cc703dcba350a883e0fceaec9d0db0..e668b08c5558fa1e3f521111e2094d6af9789605 100644 (file)
@@ -10,7 +10,7 @@ CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils
 CIFS_UTILS_LICENSE = GPLv3+
 CIFS_UTILS_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 CIFS_UTILS_CONF_OPTS += --disable-pie
 endif
 
index fed61d76c77b1e5b8606e860bfc41bcdd6354bb6..bbe4c4a968fb08352697c9873960427c120aea62 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_CJSON
        bool "cJSON"
        # For static build with cJSON.c directly see README
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          An ultra-lightweight, portable, single-file, simple-as-can-be ANSI-C
          compliant JSON parser, under MIT license.
index 75c90d13938c4c241ca32a25ca34b687b555d025..c12dd5b46cffb2257050b38b9d789ba3339ca2e1 100644 (file)
@@ -4,7 +4,7 @@ config BR2_PACKAGE_COLLECTD
        depends on BR2_USE_MMU
        depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          collectd is a daemon which collects system performance
          statistics periodically and provides mechanisms to store
@@ -59,7 +59,7 @@ config BR2_PACKAGE_COLLECTD_LOGFILE
 
 config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL
        bool "notify_email"
-       depends on !BR2_PREFER_STATIC_LIB # libesmtp
+       depends on !BR2_STATIC_LIBS # libesmtp
        select BR2_PACKAGE_LIBESMTP
        select BR2_PACKAGE_OPENSSL
        help
@@ -67,7 +67,7 @@ config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL
          configured recipients.
 
 comment "notify_email needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_COLLECTD_SYSLOG
        bool "syslog"
@@ -454,5 +454,5 @@ endmenu
 endif
 
 comment "collectd needs a toolchain w/ IPv6, threads, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_STATIC_LIBS
        depends on BR2_USE_MMU
index 63d50b42d2951c7dbe54f957b94057f89a0285f2..861df7d36c517d13338fbfd1357f61102e5bade4 100644 (file)
@@ -8,7 +8,7 @@ config BR2_PACKAGE_CONNMAN
        depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus, libglib2
-       depends on !BR2_PREFER_STATIC_LIB # needs dlopen()
+       depends on !BR2_STATIC_LIBS # needs dlopen()
        help
          The Connection Manager (ConnMan) project provides a daemon
          for managing internet connections within embedded devices
@@ -68,4 +68,4 @@ endif # BR2_PACKAGE_CONNMAN
 
 comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver, dynamic library"
        depends on BR2_USE_MMU && !BR2_avr32
-       depends on !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index f02ff177ab06d894a339cbcb42421aaa601e405c..85ba1182392b1c8466b35b3d1535dddeb9b1da9e 100644 (file)
@@ -5,7 +5,7 @@ config BR2_PACKAGE_CPPCMS
        select BR2_PACKAGE_LIBGCRYPT
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
-       depends on !BR2_PREFER_STATIC_LIB # dlopen()
+       depends on !BR2_STATIC_LIBS # dlopen()
        depends on BR2_USE_WCHAR
        help
          CppCMS is a Free High Performance Web Development Framework
@@ -36,4 +36,4 @@ endif
 
 comment "cppcms needs a toolchain w/ C++, NPTL, wchar, dynamic library"
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
-               !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+               !BR2_USE_WCHAR || BR2_STATIC_LIBS
index 19c9419d49ea8e3c973d75f970e18fb18ee8f51a..9037a7a0c67625eaff3e3c669e22ae138d1f3b09 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_CPPDB
        bool "cppdb"
        # dlfcn.h
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
        # Can be built without them but it's useless
@@ -16,4 +16,4 @@ config BR2_PACKAGE_CPPDB
 comment "cppdb needs a toolchain w/ C++, threads, dynamic library"
        depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index d7582b3b6b6d27fdeab1179aa0340c14a6f3683e..f349fb3b1abf796db0e461b37331db58683e03ba 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_CPPUNIT
        bool "cppunit"
        depends on BR2_INSTALL_LIBSTDCPP
        # currently the static situation is not correctly detected.
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          CppUnit is the C++ port of the famous JUnit framework for
          unit testing.  Test output is in XML or text format for
@@ -11,4 +11,4 @@ config BR2_PACKAGE_CPPUNIT
          http://www.freedesktop.org/wiki/Software/cppunit/
 
 comment "cppunit needs a toolchain w/ C++, dynamic library"
-       depends on !BR2_INSTALL_LIBSTDCPP || BR2_PREFER_STATIC_LIB
+       depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
index 4d01530d85c08518e79960b837397676a0714583..5318fc1de6cdfdeb4a6a37858e6a57aca02f36b7 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_CRDA
        bool "crda"
        depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_LIBGCRYPT
        select BR2_PACKAGE_LIBNL
        # regdb is a runtime dependency
@@ -20,6 +20,6 @@ config BR2_PACKAGE_CRDA
          http://linuxwireless.org/en/developers/Regulatory/CRDA
 
 comment "crda needs a toolchain w/ threads, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
index f3d3e8009011d14c0937c86efa484d379f1e1405..3c06e075d2f94524e186e5f31766a784a4b23263 100644 (file)
@@ -18,7 +18,7 @@ CRDA_LICENSE_FILES = LICENSE
 #
 # libgcrypt needs -lgpg-error if linking statically, which is correctly
 # set by the libgcrypt-config script (and in the right order).
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 CRDA_NLLIBS += -lnl-3 -lm -lpthread
 CRDA_LDLIBS += `$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`
 endif
index 354579469aeb0a635ec7b3ac325d989efd6ce08e..353420fc9d802977c5b9172150f1e8f3008383a5 100644 (file)
@@ -8,7 +8,7 @@ config BR2_PACKAGE_CRYPTSETUP
        depends on BR2_LARGEFILE # lvm2, util-linux
        depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
        depends on BR2_USE_MMU # lvm2, e2fsprogs
-       depends on !BR2_PREFER_STATIC_LIB # lvm2
+       depends on !BR2_STATIC_LIBS # lvm2
        depends on BR2_USE_WCHAR # util-linux
        help
          This tool helps manipulate dm-crypt and luks partitions for
@@ -19,4 +19,4 @@ config BR2_PACKAGE_CRYPTSETUP
 comment "cryptsetup needs a toolchain w/ largefile, wchar, threads, dynamic library"
        depends on BR2_USE_MMU
        depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || \
-               BR2_PREFER_STATIC_LIB || !BR2_TOOLCHAIN_HAS_THREADS
+               BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
index ec40f3da0caa051334da81d13a9c2bdc953062c1..890343260250ee35b66a6ef5014cc38471814d43 100644 (file)
@@ -10,7 +10,7 @@ config BR2_PACKAGE_CURLFTPFS
        depends on BR2_USE_WCHAR # glib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
        depends on BR2_USE_MMU # libfuse, glib2
-       depends on !BR2_PREFER_STATIC_LIB # libfuse
+       depends on !BR2_STATIC_LIBS # libfuse
        help
          CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE
          and libcurl.
@@ -19,4 +19,4 @@ config BR2_PACKAGE_CURLFTPFS
 
 comment "curlftpfs needs a toolchain w/ largefile, wchar, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index db53b5af15a45f7d316a20c33537691317238d36..da49836be2eafd6120a47ae96731abea9105a99a 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_CWIID
        bool "cwiid"
        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 -> libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2
index 25f67d521237f435bf729552e04d3903a397dfb4..b585c94f9dd723a3c2a1e33dc45e7f651d1089ca 100644 (file)
@@ -18,7 +18,7 @@ CZMQ_LICENSE_FILES = LICENSE
 # host-python, so disable asciidoc entirely.
 CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 CZMQ_CONF_OPTS += LIBS="-lstdc++ -lm"
 endif
 
index 2d5d2c8d667e2d4a119e1d1854e54ea105f6e935..ed400e8fc5d728cd0189485412d8a919cc7a1d55 100644 (file)
@@ -34,7 +34,7 @@ DBUS_CONF_OPTS = --with-dbus-user=dbus \
                --with-system-socket=/var/run/dbus/system_bus_socket \
                --with-system-pid-file=/var/run/messagebus.pid
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 DBUS_CONF_OPTS += LIBS='-pthread'
 endif
 
index ec7d0e0c5c20830a19c8ce3823a17a2aa9bde62e..26226eb75c3185a3e5762d47da7181527dd48616 100644 (file)
@@ -14,7 +14,7 @@ ifeq ($(BR2_INET_IPV6),)
        DHCPCD_CONFIG_OPTS += --disable-ipv6
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        DHCPCD_CONFIG_OPTS += --enable-static
 endif
 
index ce889f432339df05cf82e25fdacbd2e07058d23c..075631950f69b40af46253752c2ddcaf0181fe5d 100644 (file)
@@ -11,7 +11,7 @@ DHCPDUMP_LICENSE = BSD-2c
 DHCPDUMP_LICENSE_FILES = LICENSE
 
 DHCPDUMP_LIBS = -lpcap
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 DHCPDUMP_LIBS += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)
 endif
 
index 3aa51cba0dda6bea6962e13f84d153e9d92ad528..7759f8f11b0ef685ac5742b4ac9d9924a70fc3e4 100644 (file)
@@ -97,12 +97,12 @@ config BR2_PACKAGE_DIRECTFB_SERIALMOUSE
 
 config BR2_PACKAGE_DIRECTFB_TSLIB
        bool "enable touchscreen support"
-       depends on !BR2_PREFER_STATIC_LIB # tslib
+       depends on !BR2_STATIC_LIBS # tslib
        default y
        select BR2_PACKAGE_TSLIB
 
 comment "touchscreen support needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_DIRECTFB_GIF
        bool "enable GIF support"
@@ -111,10 +111,10 @@ config BR2_PACKAGE_DIRECTFB_GIF
 config BR2_PACKAGE_DIRECTFB_IMLIB2
        bool "enable IMLIB2 support"
        select BR2_PACKAGE_IMLIB2
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
 
 comment "imlib2 support needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_DIRECTFB_JPEG
        bool "enable JPEG support"
index 7f1c8d7d2e53f7958742e4e4d6f44481e7b20498..4e4a3c0d948a9bfb826184a1fad337308f7eb078 100644 (file)
@@ -26,7 +26,7 @@ DIRECTFB_CONF_OPTS = \
        --disable-video4linux2 \
        --without-tools
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 DIRECTFB_CONF_OPTS += --disable-dynload
 endif
 
index 2e3a3fafb2998516562a88c82b9249302ecd4bda..0e33a0da13c0ba2b15947b6b0ac31aa54b8aa30d 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_DMRAID
        depends on BR2_LARGEFILE
        depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
        depends on BR2_USE_MMU # lvm2
-       depends on !BR2_PREFER_STATIC_LIB # lvm2
+       depends on !BR2_STATIC_LIBS # lvm2
        select BR2_PACKAGE_LVM2
        help
          dmraid discovers, activates, deactivates and displays properties
@@ -14,5 +14,5 @@ config BR2_PACKAGE_DMRAID
 
 comment "dmraid needs a toolchain w/ largefile, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB || \
+       depends on !BR2_LARGEFILE || BR2_STATIC_LIBS || \
                !BR2_TOOLCHAIN_HAS_THREADS
index e7123f8fde4d04802536116c0a0085ea4ef44450..9b1092e8cd7d3855e343e122cf204d9a2385d4fc 100644 (file)
@@ -25,7 +25,7 @@ endif
 ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y)
        DNSMASQ_DEPENDENCIES += gmp nettle
        DNSMASQ_COPTS += -DHAVE_DNSSEC
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC
 endif
 endif
@@ -57,7 +57,7 @@ ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y)
        DNSMASQ_DEPENDENCIES += lua
 
 # liblua uses dlopen when dynamically linked
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ifneq ($(BR2_STATIC_LIBS),y)
        DNSMASQ_MAKE_OPTS += LIBS+="-ldl"
 endif
 
index d5a350993316d63f4733d2681e1444f4ff20ad86..f897d1ca737eb4f08bb7206a55cc8506caa3064b 100644 (file)
@@ -14,7 +14,7 @@ DROPBEAR_MAKE =       $(MAKE) MULTI=1 SCPPROGRESS=1 \
 DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c
 DROPBEAR_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 DROPBEAR_MAKE += STATIC=1
 endif
 
index 194b012b0222db694eef887b25284e0f95d448c1..7b02dd22a9f162d9d6ece564040daaa96abbb2df 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_DTC
        bool "dtc (libfdt)"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          The Device Tree Compiler, dtc, takes as input a device-tree in
          a given format and outputs a device-tree in another format.
@@ -34,4 +34,4 @@ comment "dtdiff will not be installed: it requires bash"
 endif
 
 comment "dtc needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index f2ad96cf0a442514d08dd93361ea65cf14e67693..892af63c25575c1aaa6f390a591ec127d8c301d6 100644 (file)
@@ -15,7 +15,7 @@ DVB_APPS_DEPENDENCIES = libiconv
 DVB_APPS_LDLIBS += -liconv
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 DVB_APPS_MAKE_OPTS += static=1
 endif
 
index 8ee316a03922568898538cfa7a6fb150c56aeb93..b4f095064fffee86f36c14bf4a3ddde0e1ed85f7 100644 (file)
@@ -12,7 +12,7 @@ E2FSPROGS_INSTALL_STAGING = YES
 E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
 
 E2FSPROGS_CONF_OPTS = \
-       $(if $(BR2_PREFER_STATIC_LIB),,--enable-elf-shlibs) \
+       $(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \
        $(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
        $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
        $(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \
index 23c462874e7817ec415f80721519d2c9cd30dea7..99f936359eddb5259ebb46dbfc2a6e3abbd976c4 100644 (file)
@@ -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
index 16c0d696ae48b8d55a21ca516c66943430f12046..845717b76043cfdf76ef728f399c653022c60e42 100644 (file)
@@ -14,7 +14,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
        depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr
        depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
        depends on !BR2_MIPS_NABI32 # libnss
-       depends on !BR2_PREFER_STATIC_LIB # libnss
+       depends on !BR2_STATIC_LIBS # libnss
        help
          eCryptfs is a POSIX-compliant enterprise cryptographic
          filesystem for Linux. It is stacked on top of any other
@@ -35,4 +35,4 @@ comment "ecryptfs-utils needs a toolchain w/ largefile, threads, wchar, dynamic
        depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
        depends on BR2_USE_MMU
        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index 907c7fed12ffdb8d8ef47fac097095f81abc1a61..b35e46ad103c47c0e28c74f4555e80c377875d95 100644 (file)
@@ -17,7 +17,7 @@ if BR2_PACKAGE_LIBEDBUS
 config BR2_PACKAGE_LIBEDBUS_BLUEZ
        bool "bluez support"
        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 -> glib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> glib2
        select BR2_PACKAGE_BLUEZ_UTILS
@@ -26,7 +26,7 @@ config BR2_PACKAGE_LIBEDBUS_BLUEZ
 
 comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
        depends on !BR2_avr32
-       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
 
 config BR2_PACKAGE_LIBEDBUS_CONNMAN
        bool "connman support"
index 5d6e659d8954dec680ce02f74e5aec40f2c7997f..9f720986ef3285b7cc0781a36e8db17df8210328 100644 (file)
@@ -1,7 +1,7 @@
 comment "elfutils needs a toolchain w/ largefile, wchar, dynamic library"
        depends on !BR2_avr32
        depends on !BR2_bfin
-       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_ELFUTILS
        bool "elfutils"
@@ -9,7 +9,7 @@ config BR2_PACKAGE_ELFUTILS
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
        depends on BR2_LARGEFILE
        depends on BR2_USE_WCHAR
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        # canonicalize_file_name() not available on uClibc 0.9.31, used
        # only for AVR32
        depends on !BR2_avr32
index 0566582c1ecb418ae0933fe1102272ca39c2a931..56830dae448bdf8ff3616d600442b02a7bc8b405 100644 (file)
@@ -1,11 +1,11 @@
 comment "erlang needs a toolchain w/ threads, shared library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS && BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS && BR2_STATIC_LIBS
 
 config BR2_PACKAGE_ERLANG
        bool "erlang"
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Erlang is a programming language used to build massively scalable
          soft real-time systems with requirements on high availability.
index 6101d6d34d6a5d02b4123290901b8e7de0aa8c13..7916fd03cfaddfc2ddadd196bd05c3da55cc0f95 100644 (file)
@@ -5,7 +5,7 @@ config BR2_PACKAGE_EUDEV
        depends on BR2_USE_MMU # uses fork()
        depends on BR2_LARGEFILE # util-linux
        depends on BR2_USE_WCHAR # util-linux
-       depends on !BR2_PREFER_STATIC_LIB # kmod
+       depends on !BR2_STATIC_LIBS # kmod
        select BR2_PACKAGE_HAS_UDEV
        select BR2_PACKAGE_UTIL_LINUX
        select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
@@ -39,4 +39,4 @@ comment "eudev needs eudev /dev management"
 comment "eudev needs a toolchain w/ largefile, wchar, dynamic library"
        depends on !BR2_avr32
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
index 92e6c381705e4358bb9c6d83326b0e8948511646..e5e17e9ce826b8620761a1b1a000047f44578354 100644 (file)
@@ -4,7 +4,7 @@ config BR2_PACKAGE_EXFAT
        depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
        depends on BR2_USE_MMU # libfuse
        depends on BR2_USE_WCHAR
-       depends on !BR2_PREFER_STATIC_LIB # libfuse
+       depends on !BR2_STATIC_LIBS # libfuse
        select BR2_PACKAGE_LIBFUSE
        help
          A full-featured exFAT file system implementation for GNU/Linux
@@ -14,4 +14,4 @@ config BR2_PACKAGE_EXFAT
 
 comment "exfat needs a toolchain w/ largefile, wchar, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS
index ba184f01ef71a93b4ca1421daea6afaf3714c9fa..c42c7c140555adf7115c39ad38b4e29f6afcaeb4 100644 (file)
@@ -86,7 +86,7 @@ endef
 endif # CUSTOM_CONFIG
 
 # exim needs a bit of love to build statically
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 EXIM_STATIC_FLAGS = LFLAGS="-pthread --static"
 endif
 
index b2e2ac83d0950fa9412649b78e80079ba24d673e..3837dd7fa6257be72832ecc6a73bb145efb91da8 100644 (file)
@@ -1,9 +1,9 @@
 comment "exiv2 needs a toolchain w/ C++, dynamic library"
-       depends on BR2_PREFER_STATIC_LIB || !BR2_INSTALL_LIBSTDCPP
+       depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP
 
 config BR2_PACKAGE_EXIV2
        bool "exiv2"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_INSTALL_LIBSTDCPP
        help
          Exiv2 is a C++ library and a command line utility to manage
index 23133b7a12d43a845183908faf9e0d20a2661de0..de2cc7979e954412582328678606c00ba7547e91 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_FAIFA
        bool "faifa"
        select BR2_PACKAGE_LIBPCAP
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_TOOLCHAIN_HAS_THREADS
        help
          Faifa can configure any Intellon-based Power Line
@@ -13,4 +13,4 @@ config BR2_PACKAGE_FAIFA
          https://dev.open-plc.org
 
 comment "faifa needs a toolchain w/ dynamic library, threads"
-       depends on BR2_PREFER_STATIC_LIB || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
index 19d5ceaa71f1f668e56a6ba9216a66cf1b001f0e..fe24a6f1ff6e7366dbabda30a972c4b8b895861b 100644 (file)
@@ -17,7 +17,7 @@ ifeq ($(BR2_PACKAGE_FBV_PNG),y)
 FBV_DEPENDENCIES += libpng
 
 # libpng in turn depends on other libraries
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 FBV_CONFIGURE_OPTS += "--libs=$(shell $(PKG_CONFIG_HOST_BINARY) --libs libpng --static)"
 endif
 
index 1820dc471343bb5cad65106d2461e715baf9c7fd..e3eeb925bb3ebae4acd152054b2a41c4b611bcef 100644 (file)
@@ -337,7 +337,7 @@ else
 FFMPEG_CONF_OPTS += --disable-altivec
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 FFMPEG_CONF_OPTS += --enable-pic
 else
 FFMPEG_CONF_OPTS += --disable-pic
index a3af7c1e01102d841466ad91c14cdd41913b9da7..1222310bfddf485f0b625d8be7401360a4226e8a 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_FLANN
        bool "flann"
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        # triggers an assert in the linker of this toolchain
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
        help
@@ -24,4 +24,4 @@ config BR2_PACKAGE_FLANN_EXAMPLES
 endif
 
 comment "flann needs a toolchain w/ C++, dynamic library"
-       depends on !BR2_INSTALL_LIBSTDCPP || BR2_PREFER_STATIC_LIB
+       depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
index 03ab38f9f1bb0a0465076b45ee60049117a77da8..d268454aae675a71d3e60ce4c4c9834a3493d3ff 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_FSWEBCAM
        bool "fswebcam"
        depends on BR2_USE_MMU # fork()
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_GD
        select BR2_PACKAGE_FREETYPE
        select BR2_PACKAGE_JPEG
@@ -19,4 +19,4 @@ config BR2_PACKAGE_FSWEBCAM
 
 comment "fswebcam needs a toolchain w/ dynamic library"
        depends on BR2_USE_MMU
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index d0213a7b46025d92674f1211af26b6fffc5a0cef..5b4d818b173f92fa7ce3d64661b0cbb0e5157f52 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_GAWK
        bool "gawk"
        depends on BR2_USE_WCHAR
        depends on BR2_USE_MMU # fork()
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          A special-purpose programming language which is data driven
          rather than procedural.  Allows for simple data-reformatting jobs
@@ -12,4 +12,4 @@ config BR2_PACKAGE_GAWK
 
 comment "gawk needs a toolchain w/ wchar, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
index 958b4452d76ad4037eb49b57b301e0bb3a25a487..c014bc5a20fd7d2df649cb3ded88f0f7955c6969 100644 (file)
@@ -54,7 +54,7 @@ HOST_GCC_FINAL_CONF_OPTS = \
        --with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin
 
 # Disable shared libs like libstdc++ if we do static since it confuses linking
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 HOST_GCC_FINAL_CONF_OPTS += --disable-shared
 else
 HOST_GCC_FINAL_CONF_OPTS += --enable-shared
@@ -146,7 +146,7 @@ define HOST_GCC_FINAL_INSTALL_STATIC_LIBS
        done
 endef
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 define HOST_GCC_FINAL_INSTALL_SHARED_LIBS
        for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \
                cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/$${i}.so* \
index 7b8f03851a2d699f6ba777241dc2f0d131eeffa0..f50271ac53a9dc338ce990636f706c4cf3c9d8e6 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GIBLIB
        bool "giblib"
        depends on BR2_PACKAGE_XORG7
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_IMLIB2
        select BR2_PACKAGE_IMLIB2_X
        help
@@ -10,4 +10,4 @@ config BR2_PACKAGE_GIBLIB
          http://linuxbrit.co.uk/giblib/
 
 comment "giblib support needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 0148c13f3c36ede336ca0dda1f8fa3323be6f781..2d0d366d7eef790376126226f157af0b04f0cac9 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_GPM
        bool "gpm"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU # fork()
        help
          "gpm" means general purpose mouse (server) and provides mouse support
@@ -22,5 +22,5 @@ config BR2_PACKAGE_GPM_INSTALL_TEST_TOOLS
 endif
 
 comment "gpm mouse server needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
        depends on BR2_USE_MMU
index 0a73b63637b13c0e7796532a0ae5975e368a4f16..075af573991cde9165548651e84082ec4b180b40 100644 (file)
@@ -26,7 +26,7 @@ GPTFDISK_DEPENDENCIES += icu
 GPTFDISK_MAKE_OPTS += USE_UTF16=y
 endif
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_PREFER_STATIC_LIB),yy)
+ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_STATIC_LIBS),yy)
 GPTFDISK_MAKE_OPTS += LDLIBS=-lintl
 endif
 
index 984b64c0bd5cfa35cbc3018823a6df3865b32e41..0fc7877501bcc1cc01461efc6158736f29efbb4d 100644 (file)
@@ -80,7 +80,7 @@ else
 GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic
 endif
 
index c455acab74fc80a0897d05c3b4f22419a2dbc6f6..9ccce948f5d08802b66d986fa01d45d343d99056 100644 (file)
@@ -372,7 +372,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
        bool "wayland"
        depends on !BR2_avr32 # wayland
-       depends on !BR2_PREFER_STATIC_LIB # wayland
+       depends on !BR2_STATIC_LIBS # wayland
        depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
        select BR2_PACKAGE_WAYLAND
        help
index 958b8c35670fce816dcc72083cd1bc2cc2a1359e..341ec8c2ff20f800b7cf74fc58b87913b930c815 100644 (file)
@@ -41,13 +41,13 @@ comment "plugins with external dependencies (there may be more available)"
 config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD
        bool "dvdread"
        depends on BR2_LARGEFILE # libdvdread
-       depends on !BR2_PREFER_STATIC_LIB # libdvdread
+       depends on !BR2_STATIC_LIBS # libdvdread
        select BR2_PACKAGE_LIBDVDREAD
        help
          Access a DVD with dvdread
 
 comment "dvdread needs a toolchain w/ dynamic library, largefile"
-       depends on !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
        bool "lame (*.mp3 audio encoder)"
index 3db70ef48e4a894ac065030746081494ec0b424a..f0de7908d4b4a85fdcd7ed1c01dc10dc452f126d 100644 (file)
@@ -19,7 +19,7 @@ ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
        HASERL_DEPENDENCIES += lua
 
 # liblua uses dlopen when dynamically linked
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ifneq ($(BR2_STATIC_LIBS),y)
        HASERL_CONF_ENV += LIBS="-ldl"
 endif
 
index a2521ef6639c24b876e426388e120a0c1dc28011..87664b489e7b22403852cc4b2fbdf381335efe52 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_HEIRLOOM_MAILX
        bool "heirloom-mailx"
        # uses fork()
        depends on BR2_USE_MMU
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Heirloom mailx (previously known as nail) is a mail user
          agent for Unix systems.
@@ -16,5 +16,5 @@ config BR2_PACKAGE_HEIRLOOM_MAILX
          http://heirloom.sourceforge.net/mailx.html
 
 comment "heirloom-mailx needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
        depends on BR2_USE_MMU
index 6ca396ee390426a6f84770bba60951786314cd25..656645bff15eb7d325469f1d8e6db9dd2763170e 100644 (file)
@@ -16,12 +16,12 @@ if BR2_PACKAGE_HOSTAPD
 
 config BR2_PACKAGE_HOSTAPD_EAP
        bool "Enable EAP"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Enable support for EAP and RADIUS.
 
 comment "hostapd EAP needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_HOSTAPD_WPS
        bool "Enable WPS"
index dec9ef852ebeffe28e2126184fe74fc7b7c83a44..d4a5304148153b66d2a96b798290880af0f67c95 100644 (file)
@@ -31,7 +31,7 @@ HOSTAPD_CONFIG_DISABLE =
 # libnl-3 needs -lm (for rint) and -lpthread if linking statically
 # And library order matters hence stick -lnl-3 first since it's appended
 # in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 HOSTAPD_LIBS += -lnl-3 -lm -lpthread
 endif
 
@@ -42,7 +42,7 @@ endif
 # Try to use openssl if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
        HOSTAPD_DEPENDENCIES += openssl
-       HOSTAPD_LIBS += $(if $(BR2_PREFER_STATIC_LIB),-lcrypto -lz)
+       HOSTAPD_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz)
        HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
 else
        HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD
index ef162a8533211783e798b0057e2e22be96d9a23f..bea05ba3b32701601d3701c1df616b9fd3c897c7 100644 (file)
@@ -11,7 +11,7 @@ IFTOP_LICENSE = GPLv2+
 IFTOP_LICENSE_FILES = COPYING
 
 IFTOP_LIBS = -lpcap
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 IFTOP_LIBS += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)
 endif
 IFTOP_CONF_ENV += LIBS+="$(IFTOP_LIBS)"
index 757f10093d7bb8ab187352cc7d0355b9ec03e83c..a323a8db0e7a7bae1e3860424ffbde66968c409a 100644 (file)
@@ -1,10 +1,10 @@
 comment "imlib2 needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_IMLIB2
        bool "imlib2"
        select BR2_PACKAGE_FREETYPE
-       depends on !BR2_PREFER_STATIC_LIB # dlopen()
+       depends on !BR2_STATIC_LIBS # dlopen()
        help
          Imlib 2 is the successor to Imlib. This library provides
          routines to load, save and render images in various formats.
index 2809531266e1659b3ae80bc27bae044a06b05def..65f6851cb2ea137fd1f9c87abe697822319d796d 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_INADYN
        bool "inadyn"
        depends on BR2_USE_MMU # Uses fork()
-       depends on !BR2_PREFER_STATIC_LIB # dlopen()
+       depends on !BR2_STATIC_LIBS # dlopen()
        help
          INADYN is a free DynDNS client. It gives the possibility
          to have your own fixed hostname registered on the internet,
@@ -10,5 +10,5 @@ config BR2_PACKAGE_INADYN
          https://github.com/troglobit/inadyn
 
 comment "inadyn needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
        depends on BR2_USE_MMU
index 535dc07fd8722905bdbfd8ba1a6b1069d48e4556..d9160277dae2727ab1c38a3ae2cbbf9e15152987 100644 (file)
@@ -16,7 +16,7 @@ IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
 IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)'
 
 # openssl uses zlib, so we need to explicitly link with it when static
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 IPSEC_TOOLS_CONF_ENV += LIBS=-lz
 endif
 
index 2ef879d85e136df3468adab44995d948a01d723d..38faa6899520c180042f8d880155a72e711ab5f4 100644 (file)
@@ -14,7 +14,7 @@ IPTABLES_LICENSE = GPLv2
 IPTABLES_LICENSE_FILES = COPYING
 # Building static causes ugly warnings on some plugins
 IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \
-       $(if $(BR2_PREFER_STATIC_LIB),,--disable-static)
+       $(if $(BR2_STATIC_LIBS),,--disable-static)
 # Because of iptables-01-fix-static-link.patch
 IPTABLES_AUTORECONF = YES
 
index 544ac55da8cd9a9b8d16fcdb3dbf59b237b29bfa..df6e25711a3e0fe92fe2b7818eb04e936ebaf122 100644 (file)
@@ -14,7 +14,7 @@ IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
 IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
        GIT_DIR=$(IW_DIR)
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 # libnl needs pthread/m, so we need to explicitly with them when static
 # these need to added AFTER libnl, so we have to override LIBS completely
 IW_MAKE_OPTS += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
index add61d69357610787098e709c0065518a177eee3..d573276bfd447d289093475e75c224168b869bf9 100644 (file)
@@ -25,7 +25,7 @@ define JIMTCL_LINK_TCLSH
 endef
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 JIMTCL_SHARED =
 JIMTCL_LIB = a
 JIMTCL_INSTALL_LIB =
index 8db605876e2a492d6a8cc9221a1f6d5c44dae46a..7d3beff877784d027782049cc57b805191104534 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_KEXEC_LITE
        bool "kexec-lite"
        depends on BR2_powerpc || BR2_powerpc64
-       depends on !BR2_PREFER_STATIC_LIB # dtc, elfutils
+       depends on !BR2_STATIC_LIBS # dtc, elfutils
        depends on BR2_LARGEFILE # elfutils
        depends on BR2_USE_WCHAR # elfutils
        select BR2_PACKAGE_ELFUTILS
@@ -16,4 +16,4 @@ config BR2_PACKAGE_KEXEC_LITE
 
 comment "kexec-lite needs a toolchain w/ largefile, wchar, dynamic library"
        depends on BR2_powerpc || BR2_powerpc64
-       depends on BR2_PREFER_STATIC_LIB || !BR2_LARGEFILE || !BR2_USE_WCHAR
+       depends on BR2_STATIC_LIBS || !BR2_LARGEFILE || !BR2_USE_WCHAR
index 27cd4ae716b0b447c9a099e8eeed395776ef6e67..2038c0dd844e4a46f5f5cf60ca3bfde881e86ce6 100644 (file)
@@ -19,7 +19,7 @@ KEYUTILS_MAKE_PARAMS =                    \
        CPPFLAGS="$(TARGET_CPPFLAGS) -I." \
        LNS="$(HOSTLN) -sf"
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 KEYUTILS_MAKE_PARAMS += NO_SOLIB=1
 endif
 
index 2e8b9550c5d60b8dd7427e1f311a1f36cff1a5e0..8703e827010ec48e0767bd519df90fe9bbdcf3b2 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_KMOD
        bool "kmod"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          handle kernel modules
 
index 014397468403a313a29dd79e46139f55f1510910..2c0adb1e0401f6fe813a4870a10525f5ebab6cdb 100644 (file)
@@ -10,7 +10,7 @@ KNOCK_LICENSE = GPLv2+
 KNOCK_LICENSE_FILES = COPYING
 KNOCK_DEPENDENCIES = libpcap
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 KNOCK_CONF_OPTS = LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
 endif
 
index a50b0188e06f59f46f2627db1a7f73a8fe5948f9..158657992b3f2ab4306626457a6ac788cb3eb1e1 100644 (file)
@@ -11,7 +11,7 @@ LFTP_LICENSE_FILES = COPYING
 LFTP_AUTORECONF = YES
 LFTP_DEPENDENCIES = readline zlib host-pkgconf
 
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ifneq ($(BR2_STATIC_LIBS),y)
 LFTP_CONF_OPTS += --with-modules
 endif
 
index 8522128ee145fcbaf567efb7b581aad8f6d9eb73..61528d948ae44d7137cb7fd71fc9f3a96a65f7eb 100644 (file)
@@ -12,7 +12,7 @@ LIBARCHIVE_LICENSE_FILES = COPYING
 LIBARCHIVE_CONF_OPTS = --without-lzma
 
 ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y)
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static
 else
 LIBARCHIVE_CONF_OPTS += --enable-bsdtar=shared
@@ -22,7 +22,7 @@ LIBARCHIVE_CONF_OPTS += --disable-bsdtar
 endif
 
 ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),y)
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBARCHIVE_CONF_OPTS += --enable-bsdcpio=static
 else
 LIBARCHIVE_CONF_OPTS += --enable-bsdcpio=shared
index e17477380f1c77b9f06e2affc3416ff0b563d4fa..357a562d9c1d10e5bb2cefbfcd554a7e950e1c82 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBBLURAY
        bool "libbluray"
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          libbluray is a client library for accessing bluray disks.
 
@@ -9,4 +9,4 @@ config BR2_PACKAGE_LIBBLURAY
 
 comment "libbluray needs a toolchain w/ threads, dynamic library"
        depends on !BR2_TOOLCHAIN_HAS_THREADS
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 42bd19aa824805c702c743e2fd8e1fa2d5bafc4f..512dac877feababd4f4fba16edee661c25068292 100644 (file)
@@ -23,7 +23,7 @@ endif
 # we don't have host-attr
 HOST_LIBCAP_DEPENDENCIES =
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBCAP_MAKE_TARGET = libcap.a
 LIBCAP_MAKE_INSTALL_TARGET = install-static
 else
index 80974726e82e7aebff13d0c96ae99c16e57e2532..e5fa9c8d9a3f1c2c81c64cf95c1ef1084560ede5 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBCEC
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_WCHAR
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          libcec allows you in combination with the right hardware to
          control your home theater devices with your TV remote
@@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBCEC
 
 comment "libcec needs a toolchain w/ C++, wchar, threads, dynamic library"
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-               !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+               !BR2_USE_WCHAR || BR2_STATIC_LIBS
index f46a1fa74c3654d57804efe24e367c47360b6374..7cb3417382e2ae625dbe125af39ee859d68c10aa 100644 (file)
@@ -9,7 +9,7 @@ LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VE
 LIBCGI_INSTALL_STAGING = YES
 # use cross CC/AR rather than host
 LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" \
-       $(if $(BR2_PREFER_STATIC_LIB),STATIC=1)
+       $(if $(BR2_STATIC_LIBS),STATIC=1)
 LIBCGI_LICENSE = LGPLv2.1+
 
 $(eval $(autotools-package))
index 40a375a09462cc7614c447a02cbe69b313253554..54a25de86e2a90f0cddf163822153820a3d3a85d 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBDVDNAV
        bool "libdvdnav"
        depends on BR2_LARGEFILE # libdvdread
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB # libdvdread
+       depends on !BR2_STATIC_LIBS # libdvdread
        select BR2_PACKAGE_LIBDVDREAD
        help
          libdvdnav is a library that allows easy use of sophisticated
@@ -12,4 +12,4 @@ config BR2_PACKAGE_LIBDVDNAV
          http://www.mplayerhq.hu
 
 comment "libdvdnav needs a toolchain w/ dynamic library, largefile, threads"
-       depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index 65d3d408313c31c79a8c4c91954aefa4dedd20d6..05a97c0f33b6f44ec7fef185afeb924c65980e29 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBDVDREAD
        bool "libdvdread"
        depends on BR2_LARGEFILE
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          libdvdread provides a simple foundation for reading
          DVD-Video images.
@@ -9,4 +9,4 @@ config BR2_PACKAGE_LIBDVDREAD
          http://www.mplayerhq.hu/MPlayer/releases/dvdnav/
 
 comment "libdvdread needs a toolchain w/ dynamic library, largefile"
-       depends on !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || BR2_STATIC_LIBS
index 618ef1a915285ac6ec76e7a7320f6002a030b1d5..67dcfc6e42109e11d59d27d0ee41c3a09b468486 100644 (file)
@@ -11,7 +11,7 @@ LIBEBML_INSTALL_STAGING = YES
 LIBEBML_LICENSE = LGPLv2.1+
 LIBEBML_LICENSE_FILES = LICENSE.LGPL
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBEBML_MAKE_TARGETS = staticlib
 LIBEBML_MAKE_INSTALL_TARGETS = install_staticlib install_headers
 else
index 42a1c08296c757f8d8971ec1b65f835220a22fde..ba9d52751c188e7444a328b0b59b9d700455ef13 100644 (file)
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LIBESMTP
        bool "libesmtp"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Library for sending emails through SMTP.
 
          http://www.stafford.uklinux.net/libesmtp
 
 comment "libesmtp needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 1b90c3b9dc7b41b334493e09c8c0e087f275921a..5d6d636dbf92a5e4cba363f8e6a77de2178ee149 100644 (file)
@@ -10,7 +10,7 @@ LIBFREEFARE_DEPENDENCIES = libnfc openssl
 LIBFREEFARE_LICENSE = LGPLv3+ with exception
 LIBFREEFARE_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 # openssl needs zlib even if the libfreefare example itself doesn't
 LIBFREEFARE_CONF_ENV += LIBS='-lz'
 endif
index 5561d9d4f6aac58ceb1988dd5b8ed950eaf1d3c3..0e9e96989e0969d4d820df35808856bcf8330644 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBFUSE
        bool "libfuse"
        # Really doesn't like static, see fuse/lib/fuse.c
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_LARGEFILE
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
@@ -12,4 +12,4 @@ config BR2_PACKAGE_LIBFUSE
 
 comment "libfuse needs a toolchain w/ largefile, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index 17a1e9a78c36d687a0106aa277942debe5ef10e5..c73a69f10e78a45465ea9f8e1379d62380a435a9 100644 (file)
@@ -13,7 +13,7 @@ LIBJSON_LICENSE_FILES = License.txt
 
 LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBJSON_MAKE_OPTS += SHARED=0
 else
 LIBJSON_MAKE_OPTS += SHARED=1
@@ -30,7 +30,7 @@ define LIBJSON_EXTRACT_CMDS
 endef
 
 define LIBJSON_BUILD_CMDS
-       mkdir -p $(@D)/Objects_$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
+       mkdir -p $(@D)/Objects_$(if $(BR2_STATIC_LIBS),static,shared) \
                $(@D)/_internal/Source/Dependencies
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
                $(LIBJSON_MAKE_OPTS) -C $(@D)
index fe4927505c9efd1496ab6c1271ce375cb43a8a4b..778e74c3c460c126a015c5e3e6eacb0f48f8dfdf 100644 (file)
@@ -12,7 +12,7 @@ LIBMATROSKA_LICENSE = LGPLv2.1+
 LIBMATROSKA_LICENSE_FILES = LICENSE.LGPL
 LIBMATROSKA_DEPENDENCIES = libebml
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBMATROSKA_MAKE_TARGETS = staticlib
 LIBMATROSKA_MAKE_INSTALL_TARGETS = install_staticlib install_headers
 else
index af045e799a32e967160751d87f80332f0eddf69e..46877c37a263fe7b0f00700641bc2e943df1eff7 100644 (file)
@@ -11,12 +11,12 @@ if BR2_PACKAGE_LIBNL
 config BR2_PACKAGE_LIBNL_TOOLS
        bool "install tools"
        # uses <dlfcn.h>
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Install binary tools.
 
 comment "libnl tools needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 endif
 
 comment "libnl needs a toolchain w/ threads"
index 1930870a5108f6a88a51a08a413820c4a6aaf5cc..4beff68ee0804cdfbaf45bcd358ef7eff33cdb6a 100644 (file)
@@ -21,7 +21,7 @@ LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
 LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
 LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBNSPR_MAKE_OPTS = SHARED_LIBRARY=
 LIBNSPR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SHARED_LIBRARY= install
 LIBNSPR_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) SHARED_LIBRARY= install
index 4e8792ca5f23a8dcc5ad04d689fb99fa25d60a46..fde67106e08631060e9ae53ba7ed4e1783387729 100644 (file)
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBNSS
        depends on BR2_LARGEFILE
        depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
        depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Network Security Services (NSS) is a set of libraries designed
          to support development of security-enabled client and server
@@ -19,4 +19,4 @@ config BR2_PACKAGE_LIBNSS
 comment "libnss needs a toolchain w/ largefile, threads, dynamic library"
        depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index 18a3207fc4087e5f0551db6a5b4c9e472fd3d002..7466fb50566715ca9315c2ee6e2813fd4b49b70f 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBPHIDGET
        bool "libphidget"
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_LIBUSB
        help
          The libphidget library provides an API for controlling Phidgets
@@ -23,4 +23,4 @@ config BR2_PACKAGE_LIBPHIDGET
 
 comment "libphidget needs a toolchain w/ threads, dynamic library"
        depends on !BR2_TOOLCHAIN_HAS_THREADS
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 2ee3f1e6479ac3727692681505b3983de885206a..856793c4e055bda2eee9dd2b72ca62be6700d988 100644 (file)
@@ -12,7 +12,7 @@ LIBPTHREAD_STUBS_LICENSE_FILES = COPYING
 
 LIBPTHREAD_STUBS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread"
 endif
 
index 7999c4a6e0685d6df40f2ffc8045c338c0e48682..356f137d63adcfde6eb8366fcf1cdd3e7b693f4c 100644 (file)
@@ -13,7 +13,7 @@ LIBSEPOL_INSTALL_STAGING = YES
 
 LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS)
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIBSEPOL_MAKE_FLAGS += STATIC=1
 endif
 
index 92955ee02487737edb7dbd5c2c917ede7bd5d637..0895cd25132c9f55e9965ffd3427971121e4a410 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBSHAIRPLAY
        depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # avahi
-       depends on !BR2_PREFER_STATIC_LIB # avahi
+       depends on !BR2_STATIC_LIBS # avahi
        select BR2_PACKAGE_AVAHI
        select BR2_PACKAGE_AVAHI_DAEMON
        select BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY # runtime
@@ -15,4 +15,4 @@ config BR2_PACKAGE_LIBSHAIRPLAY
 
 comment "libshairplay needs a toolchain w/ IPv6, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index d45806722af2142143f0da7e5d95554e9ab3e662..25ef4bb89aedb86dd73043b0d3311c01463c22f6 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBUBOX
        bool "libubox"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          This library originates from the OpenWrt project to
          handle the configuration file infrastructure, but can
@@ -10,4 +10,4 @@ config BR2_PACKAGE_LIBUBOX
          http://nbd.name/gitweb.cgi?p=luci2/libubox.git;a=summary
 
 comment "libubox needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 761ae6e463c41dd12c3e98ba6ccc67b7850e20e8..2f4ad40487cf158a666877af1576ec1bce242d4f 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBUCI
        bool "libuci"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_LIBUBOX
        help
          This library originates from the OpenWrt project to
@@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBUCI
          http://wiki.openwrt.org/doc/techref/uci
 
 comment "libuci needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index a0f397b327b97b8b8999ab35e354640b375a8b46..2e4ba52dcb87749a8e8c633e8ec5639a3933733c 100644 (file)
@@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBVA_INTEL_DRIVER
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs
        depends on BR2_LARGEFILE # libdrm
-       depends on !BR2_PREFER_STATIC_LIB # libva
+       depends on !BR2_STATIC_LIBS # libva
        help
          VA-API back-end driver for Intel graphics chips
 
@@ -17,5 +17,5 @@ config BR2_PACKAGE_LIBVA_INTEL_DRIVER
 
 comment "libva intel driver needs a toolchain w/ largefile, threads, dynamic library"
        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
        depends on BR2_i386 || BR2_x86_64
index 05369c5dbf3b908913c55f3356be2baf31c82f03..d3308f83d62c29cfa02c0fe963b65390f21a562e 100644 (file)
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBVA
        select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
        depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs
        depends on BR2_LARGEFILE # libdrm
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          The main motivation for VA-API (Video Acceleration API) is to enable
          hardware accelerated video decode/encode at various entry-points (VLD,
@@ -17,4 +17,4 @@ config BR2_PACKAGE_LIBVA
 
 comment "libva needs a toolchain w/ largefile, threads, dynamic library"
        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index 0d794c93afffcf49c48b56cd746a48ae19cea556..2c101e7b0460bae678c5db57b6adc416bfc66256 100644 (file)
@@ -1,11 +1,11 @@
 comment "lighttpd needs a toolchain w/ dynamic library"
        depends on BR2_USE_MMU
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_LIGHTTPD
        bool "lighttpd"
        depends on BR2_USE_MMU # fork()
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          lighttpd a secure, fast, compliant and very flexible web-server
          which has been optimized for high-performance environments. It
index c2cfdc00be2136b8744b8494c9c248f8c5ced4c3..6b92886cf1aeceb5752eec695eb989731a7ed010 100644 (file)
@@ -9,7 +9,7 @@ config BR2_PACKAGE_LINUX_PAM
        # modules. See
        # https://lists.fedorahosted.org/pipermail/linux-pam-commits/2012-February/000105.html
        # for details.
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          A Security Framework that Provides Authentication for Applications
 
@@ -17,4 +17,4 @@ config BR2_PACKAGE_LINUX_PAM
 
 comment "linux-pam needs a toolchain w/ wchar, locale, dynamic library"
        depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
-               || BR2_PREFER_STATIC_LIB
+               || BR2_STATIC_LIBS
index 46fca5b93ddd775cc6a25b077ccd23f4d66460bf..cbd1e851a01179634b04a41501fd70819ebc53a9 100644 (file)
@@ -13,7 +13,7 @@ LIVE555_INSTALL_STAGING = YES
 
 LIVE555_CFLAGS = $(TARGET_CFLAGS)
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LIVE555_CONFIG_TARGET = linux
 LIVE555_LIBRARY_LINK = $(TARGET_AR) cr
 else
index 3bd111eaa67dd68eef3bc76a826dd430866bd0de..a79977f607c9cc9b8bd479c7a2b187abecc28e2c 100644 (file)
@@ -25,7 +25,7 @@ LM_SENSORS_MAKE_OPTS = \
        MACHINE=$(KERNEL_ARCH) \
        PREFIX=/usr
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0
 else
 LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=1
index 21755e0e0fb80d625a91ccbb244ece2b18144046..59561bad4fd8f44986e835521746817f6ddd90cf 100644 (file)
@@ -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))
index bc142265a038df060dce8bfe8aca9cb25ab7b08b..40c7df9220209cfa2be0689f6473f221e6491345 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LOG4CXX
        select BR2_PACKAGE_APR
        select BR2_PACKAGE_APR_UTIL
        # apr really needs shared library support
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # apr
@@ -15,5 +15,5 @@ config BR2_PACKAGE_LOG4CXX
 
 comment "log4cxx needs a toolchain w/ C++, threads, dynamic library"
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
        depends on BR2_USE_MMU
index 08edd4584289c63994d96e600b5ed1f124705665..56e4402b88ecbf245cf71047a20ed8e4dc290b38 100644 (file)
@@ -9,7 +9,7 @@ config BR2_PACKAGE_LTRACE
        select BR2_PACKAGE_ELFUTILS
        depends on BR2_LARGEFILE # elfutils
        depends on BR2_USE_WCHAR # elfutils
-       depends on !BR2_PREFER_STATIC_LIB # elfutils
+       depends on !BR2_STATIC_LIBS # elfutils
        help
          Debugging program which runs a specified command until it exits.
          While the command is executing, ltrace intercepts and records
@@ -19,4 +19,4 @@ config BR2_PACKAGE_LTRACE
          http://ltrace.org
 
 comment "ltrace needs toolchain w/ largefile, wchar, dynamic library"
-       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
index b88f1e26a83cc9393c83dbf25499e41fa5924167..f1164ecaa309cfb4d8b51f4abea77eaaef5e1578 100644 (file)
@@ -29,7 +29,7 @@ LUA_CFLAGS += -D_FILE_OFFSET_BITS=32
 endif
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        LUA_BUILDMODE = static
 else
        LUA_BUILDMODE = dynamic
index 85e9f1528e9abe5ec2e7479db8163f4230ccbcc4..b8d839209aec09f5eeb94cfb8ec89deee59358d4 100644 (file)
@@ -18,7 +18,7 @@ ifneq ($(BR2_LARGEFILE),y)
 LUAJIT_NO_LARGEFILE = TARGET_LFSFLAGS=
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 LUAJIT_BUILDMODE = static
 else
 LUAJIT_BUILDMODE = dynamic
index 1251faecc3ff967047b45563df5faf8f15877da9..4f9ad1dfcb04e290c37e66e3519fb80b68d74231 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LVM2
        depends on BR2_LARGEFILE
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # needs fork()
-       depends on !BR2_PREFER_STATIC_LIB # It fails to build statically
+       depends on !BR2_STATIC_LIBS # It fails to build statically
        help
          This is LVM2, the rewrite of The Linux Logical Volume Manager.
          LVM supports enterprise level volume management of disk and disk
@@ -37,5 +37,5 @@ endif
 
 comment "lvm2 needs a toolchain w/ largefile, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB || \
+       depends on !BR2_LARGEFILE || BR2_STATIC_LIBS || \
                !BR2_TOOLCHAIN_HAS_THREADS
index 761ce4df7bfa1c442ba645760dcf647eb7571bbd..38e10d8dfc852eb77d10336f9add9022d80ed648 100644 (file)
@@ -10,7 +10,7 @@ LZ4_INSTALL_STAGING = YES
 LZ4_LICENSE = BSD-2c
 LZ4_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 define LZ4_DISABLE_SHARED
        $(SED) '/SHARED/d' $(@D)/Makefile
 endef
index 74ebbed60287f0d4486095d5d5b7451cb3cac06a..eb977b6510119b662207bafb53d746e8853d2322 100644 (file)
@@ -62,9 +62,9 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
          infrastructure.
 
 comment "DRI drivers needs X.Org and a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_XORG7
+       depends on BR2_STATIC_LIBS || !BR2_PACKAGE_XORG7
 
-if !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XORG7
+if !BR2_STATIC_LIBS && BR2_PACKAGE_XORG7
 
 comment "DRI drivers"
 
@@ -99,7 +99,7 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
        help
          Legacy Radeon driver for R100 series GPUs.
 
-endif # !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XORG7
+endif # !BR2_STATIC_LIBS && BR2_PACKAGE_XORG7
 
 if BR2_PACKAGE_MESA3D_DRIVER
 
index 8dfad6cc53fbf38006a022fbd41b1aa9d5cc5a2c..f57012b9452c846d9f43bec0ad8128cbd23e58f4 100644 (file)
@@ -47,7 +47,7 @@ MESA3D_CONF_OPTS += \
        --disable-xa
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 # fix for "configure: error: Cannot use static libraries for DRI drivers"
 MESA3D_CONF_OPTS += --disable-static
 endif
index 9e997f391a2726fec6ec63166698812e483a118e..bcbe5fa2158c737e89851fb9faad4455046444f8 100644 (file)
@@ -14,7 +14,7 @@ MINIDLNA_DEPENDENCIES = \
        ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite \
        host-xutil_makedepend
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 # the configure script / Makefile forgets to link with some of the dependent
 # libraries breaking static linking, so help it along
 MINIDLNA_CONF_ENV = \
index 0e115f6422e9e0f3637b26afc15e352bea54f890..bab0b22e3d7ae24c15435bb1bad6f1ef099be2da 100644 (file)
@@ -266,7 +266,7 @@ comment "Miscellaneous plugins"
 
 config BR2_PACKAGE_MPD_AVAHI_SUPPORT
        bool "avahi (zeroconf) support"
-       depends on !BR2_PREFER_STATIC_LIB # avahi
+       depends on !BR2_STATIC_LIBS # avahi
        select BR2_PACKAGE_AVAHI
        select BR2_PACKAGE_AVAHI_DAEMON
        select BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY
@@ -277,7 +277,7 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT
          local network.
 
 comment "avahi support needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT
        bool "neighbor discovery support"
index 47b5198f82a67b6b1638e31147e725ef98f57bf3..2d8e6307211d0e4b77ebb3677ed7a15ed8abc5fe 100644 (file)
@@ -15,7 +15,7 @@ MSMTP_DEPENDENCIES += host-pkgconf
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MSMTP_CONF_OPTS += --with-ssl=openssl
 MSMTP_DEPENDENCIES += openssl
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 # openssl uses zlib, so we need to explicitly link with it when static
 MSMTP_CONF_ENV += LIBS=-lz
 endif
index e7bd9672ce4f0d94e61a5b8dd2c4396d79da2555..1ce3818337f88f3fb7dace2bb91600e430ce6813 100644 (file)
@@ -15,7 +15,7 @@ NCURSES_LICENSE_FILES = README
 NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)5-config
 
 NCURSES_CONF_OPTS = \
-       $(if $(BR2_PREFER_STATIC_LIB),--without-shared,--with-shared) \
+       $(if $(BR2_STATIC_LIBS),--without-shared,--with-shared) \
        --without-cxx \
        --without-cxx-binding \
        --without-ada \
@@ -40,7 +40,7 @@ ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
 NCURSES_CONF_OPTS += --enable-widec
 NCURSES_LIB_SUFFIX = w
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 define NCURSES_LINK_LIBS
        for lib in $(NCURSES_LIBS-y); do \
                ln -sf $${lib}$(NCURSES_LIB_SUFFIX).a \
@@ -88,7 +88,7 @@ define NCURSES_BUILD_CMDS
        $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR)
 endef
 
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ifneq ($(BR2_STATIC_LIBS),y)
 define NCURSES_INSTALL_TARGET_LIBS
        for lib in $(NCURSES_LIBS-y); do \
                cp -dpf $(NCURSES_DIR)/lib/$${lib}$(NCURSES_LIB_SUFFIX).so* \
index cb635e4ee8a763ac268175a1d936ad7d17f960af..b1897c855a243cedbd4b8634984778e249c07016 100644 (file)
@@ -11,7 +11,7 @@ NE10_LICENSE_FILES = doc/LICENSE
 
 NE10_CONF_OPTS = -DGNULINUX_PLATFORM=ON
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 NE10_CONF_OPTS += \
        -DNE10_BUILD_SHARED=ON
 endif
@@ -19,7 +19,7 @@ endif
 # The package does not have any install target, so have to provide
 # INSTALL_STAGING_CMDS and INSTALL_TARGET_CMDS.
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 define NE10_INSTALL_STAGING_SHARED_LIB
        cp -dpf $(@D)/modules/libNE10*.so* $(STAGING_DIR)/usr/lib/
 endef
index 18974784a0ca882a23a91205bf2fdf828ca3b22b..91afffe11d8cf785cea9ea404902a0eccf0ac600 100644 (file)
@@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_OPENSSL),y)
        NETSNMP_DEPENDENCIES += openssl
        NETSNMP_CONF_OPTS += \
                --with-openssl=$(STAGING_DIR)/usr/include/openssl
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        # openssl uses zlib, so we need to explicitly link with it when static
        NETSNMP_CONF_ENV += LIBS=-lz
 endif
index 16d7c6f212473d6f0c021a34a5f0c1a70a1c3e76..6c26d4d61d4e271533d7e8929a400a89025072f2 100644 (file)
@@ -13,10 +13,10 @@ NFTABLES_LICENSE = GPLv2
 NFTABLES_LICENSE_FILES = COPYING
 
 NFTABLES_LIBS = -lncurses
-ifeq ($(BR2_PREFER_STATIC_LIB)$(BR2_PACKAGE_LIBNFTNL_JSON),yy)
+ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy)
 NFTABLES_LIBS += -ljansson -lm
 endif
-ifeq ($(BR2_PREFER_STATIC_LIB)$(BR2_PACKAGE_LIBNFTNL_XML),yy)
+ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_XML),yy)
 NFTABLES_LIBS += -lmxml -lpthread
 endif
 
index eb63e17e9c092d2cad72858deecbd32bca072f1d..f2fcb73c0a749090730f161c6ee8ff00d4d0a10e 100644 (file)
@@ -12,7 +12,7 @@ NGREP_LICENSE_FILES = LICENSE.txt
 NGREP_INSTALL_STAGING = YES
 
 NGREP_LIBS = -lpcap -lpcre
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 NGREP_LIBS += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)
 endif
 NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"
index 82d68073fa07f19c27f212dc912ce8248ff59bec..b59d256ca84372788d48bf2fb88b478392f2cf38 100644 (file)
@@ -44,7 +44,7 @@ ifeq ($(BR2_PACKAGE_OMNIORB_WITH_APPS),y)
 OMNIORB_POST_PATCH_HOOKS += OMNIORB_ENABLE_EXTRA_APPS
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 define OMNIORB_DISABLE_SHARED
        echo "BuildSharedLibrary =" >> $(@D)/mk/beforeauto.mk
 endef
index b52f757595f42182d04736a1c73fdbd1fd485ada..367caa6db456f70b9deb1827a91c071b3ba3b8da 100644 (file)
@@ -12,7 +12,7 @@ if BR2_PACKAGE_OPENOBEX
 config BR2_PACKAGE_OPENOBEX_BLUEZ
        bool "enable bluez support"
        depends on !BR2_avr32
-       depends on !BR2_PREFER_STATIC_LIB # bluez_utils
+       depends on !BR2_STATIC_LIBS # bluez_utils
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
@@ -20,7 +20,7 @@ config BR2_PACKAGE_OPENOBEX_BLUEZ
 
 comment "bluez support 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
 
 config BR2_PACKAGE_OPENOBEX_LIBUSB
        bool "enable libusb support"
index fe7ebf25f787347cdd43f11eaf7d46f5a718bce6..5dc937ab6392cc63cc6dbf41df6cbd39fc9ae162 100644 (file)
@@ -80,14 +80,14 @@ define OPENSSL_CONFIGURE_CMDS
                        --openssldir=/etc/ssl \
                        --libdir=/lib \
                        $(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \
-                       $(if $(BR2_PREFER_STATIC_LIB),no-shared,shared) \
+                       $(if $(BR2_STATIC_LIBS),no-shared,shared) \
                        no-idea \
                        no-rc5 \
                        enable-camellia \
                        enable-mdc2 \
                        enable-tlsext \
-                       $(if $(BR2_PREFER_STATIC_LIB),zlib,zlib-dynamic) \
-                       $(if $(BR2_PREFER_STATIC_LIB),no-dso) \
+                       $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \
+                       $(if $(BR2_STATIC_LIBS),no-dso) \
        )
        $(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile
        $(SED) "s:-O[0-9]:$(OPENSSL_CFLAGS):" $(@D)/Makefile
@@ -117,7 +117,7 @@ define OPENSSL_INSTALL_TARGET_CMDS
 endef
 
 # libdl has no business in a static build
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 define OPENSSL_FIXUP_STATIC_PKGCONFIG
        $(SED) 's/-ldl//' $(STAGING_DIR)/usr/lib/pkgconfig/libcrypto.pc
        $(SED) 's/-ldl//' $(STAGING_DIR)/usr/lib/pkgconfig/libssl.pc
@@ -126,7 +126,7 @@ endef
 OPENSSL_POST_INSTALL_STAGING_HOOKS += OPENSSL_FIXUP_STATIC_PKGCONFIG
 endif
 
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ifneq ($(BR2_STATIC_LIBS),y)
 # libraries gets installed read only, so strip fails
 define OPENSSL_INSTALL_FIXUPS_SHARED
        chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so
index b0bdd523213a16b92831070d1395960bdafffebf..5fc6977cffaa053cdd31a9ede16833356a9304cc 100644 (file)
@@ -45,12 +45,12 @@ config BR2_PACKAGE_OPENVMTOOLS_PAM
        select BR2_PACKAGE_LINUX_PAM
        # linux-pam needs locale and wchar, but we already have this
        # dependency on the main symbol, above.
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Support for PAM in openvmtools
 
 comment "PAM support needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 endif
 
index ac18f7556d176b120018911b6b168313e971f7bc..3854b236ba1daed94c1c6e11a349d139bf466684 100644 (file)
@@ -11,7 +11,7 @@ OPENVPN_DEPENDENCIES = host-pkgconf
 OPENVPN_LICENSE = GPLv2
 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
 OPENVPN_CONF_OPTS = --disable-plugin-auth-pam --enable-iproute2 \
-       $(if $(BR2_PREFER_STATIC_LIB),--disable-plugins)
+       $(if $(BR2_STATIC_LIBS),--disable-plugins)
 OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
        NETSTAT=/bin/netstat \
        ROUTE=/sbin/route
index 2640a3247a95119ab0e4220ab1cade58d42a786a..a6b72618866c6b5e76f1f8b2945a259d2b118b21 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_P11_KIT
        bool "p11-kit"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_LIBFFI
@@ -14,4 +14,4 @@ config BR2_PACKAGE_P11_KIT
 
 comment "p11-kit needs a toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index ab2c456b7389adfe0915980db06d719fb9b4d926..dc7ff2bd743ba05f52de6fd4b61cac6d340e3b10 100644 (file)
@@ -29,7 +29,7 @@ else
 PARTED_CONF_OPTS += --disable-device-mapper
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 PARTED_CONF_OPTS += --disable-dynamic-loading
 endif
 
index 2eefdc546bf98c1706936b9a6623b072701c63af..c1aa6b522dac5ad40a12c9e473f33255a4bd0da7 100644 (file)
@@ -27,7 +27,7 @@ else
        PCIUTILS_KMOD = no
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        PCIUTILS_SHARED=no
 else
        PCIUTILS_SHARED=yes
index bd715bed17c9bb5ea1f882b059c84f6448c36321..658ebe3068923298a645a7c9d9c8295cb8ff8895 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_PCSC_LITE
        bool "pcsc-lite"
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Middleware to access smart card using SCard API (PC/SC).
 
@@ -31,4 +31,4 @@ endif
 
 comment "pcsc-lite needs a toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index 7c85cfcb5b3089d41e3bff4c7ba90f390f79e9c7..61f7e5dadcd7f85c8b4d955115ab554cdeef456f 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PERL_GD
        bool "perl-gd"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_ZLIB
        select BR2_PACKAGE_LIBPNG
        select BR2_PACKAGE_FREETYPE
@@ -11,4 +11,4 @@ config BR2_PACKAGE_PERL_GD
          https://metacpan.org/release/GD
 
 comment "perl-gd needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index e722c062b4d1e78e871e91cee8abf65cf8e3f955..10b3cd032347b7d03345fa6757088d8df1824a61 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PERL_GDGRAPH
        bool "perl-gdgraph"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_PERL_GD
        select BR2_PACKAGE_PERL_GDTEXTUTIL
        help
@@ -9,4 +9,4 @@ config BR2_PACKAGE_PERL_GDGRAPH
          https://metacpan.org/release/GDGraph
 
 comment "perl-gdgraph needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index c8d038af526a5c51d233b4b7506f3bf20dd726ac..d24e568bc5664ea738fcb57de5a11277a7fa3fa7 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PERL_IO_SOCKET_SSL
        bool "perl-io-socket-ssl"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_PERL_NET_SSLEAY
        help
          Nearly transparent SSL encapsulation for IO::Socket::INET.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_PERL_IO_SOCKET_SSL
          https://github.com/noxxi/p5-io-socket-ssl
 
 comment "perl-io-socket-ssl needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 7cc5157cd24a940abb0874dbd071fd5bac1d96ef..80178e0b988293a652c23b24cd159efedb825707 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PERL_NET_SSLEAY
        bool "perl-net-ssleay"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_OPENSSL
        help
          Perl extension for using OpenSSL
@@ -8,4 +8,4 @@ config BR2_PACKAGE_PERL_NET_SSLEAY
          https://metacpan.org/release/Net-SSLeay
 
 comment "perl-net-ssleay needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 639a1e453e799050ad6c43913b822c5b80ef46f7..44fe7102d942f9f641f133def645df24869cf9e0 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PERL_XML_LIBXML
        bool "perl-xml-libxml"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_LIBXML2
        select BR2_PACKAGE_ZLIB
        select BR2_PACKAGE_PERL_XML_NAMESPACESUPPORT
@@ -11,4 +11,4 @@ config BR2_PACKAGE_PERL_XML_LIBXML
          https://bitbucket.org/shlomif/perl-xml-libxml
 
 comment "perl-xml-libxml needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 06855aba136204cbd5c31576b7c9c1a78e045d94..b1f2101d67181eb2885b31f1b1334007844ea942 100644 (file)
@@ -69,7 +69,7 @@ ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
 PERL_CONF_OPTS += -Dusedevel
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 PERL_CONF_OPTS += --all-static --no-dynaloader
 endif
 
index df41d2a581f18b6eeae9ceda5287311066e92f9e..db7577d7442dfe9fa3a7926be5955c3ab387ef61 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PHIDGETWEBSERVICE
        bool "phidgetwebservice"
        depends on BR2_TOOLCHAIN_HAS_THREADS # libusb, libphidget
-       depends on !BR2_PREFER_STATIC_LIB # libphidget
+       depends on !BR2_STATIC_LIBS # libphidget
        select BR2_PACKAGE_LIBPHIDGET
        help
          phidgetwebservice (the Phidget WebService) provides an HTTP
@@ -18,4 +18,4 @@ config BR2_PACKAGE_PHIDGETWEBSERVICE
 
 comment "phidgetwebservice needs a toolchain w/ threads, dynamic library"
        depends on !BR2_TOOLCHAIN_HAS_THREADS
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index e6ea65fb66952cd6068dc45c29cf12cb08097762..86864f08d000a2b4d34c0b7a61a89f9b2f5f48b9 100644 (file)
@@ -31,7 +31,7 @@ PHP_CONFIG_SCRIPTS = php-config
 PHP_CFLAGS = $(TARGET_CFLAGS)
 
 # We need to force dl "detection"
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 PHP_CONF_ENV += ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes
 PHP_EXTRA_LIBS += -ldl
 else
index 2088f1517bcb4ec4ff2d4e9197a29fbdc767f2db..231d0ba0af5e8904957846abb9fde5453929d2fb 100644 (file)
@@ -73,7 +73,7 @@ define $(2)_CONFIGURE_CMDS
                -DBUILD_TEST=OFF \
                -DBUILD_TESTS=OFF \
                -DBUILD_TESTING=OFF \
-               -DBUILD_SHARED_LIBS=$$(if $$(BR2_PREFER_STATIC_LIB),OFF,ON) \
+               -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \
                -DUSE_CCACHE=$$(if $$(BR2_CCACHE),ON,OFF) \
                $$($$(PKG)_CONF_OPTS) \
        )
index c961536bf09e1fdf2a2293f9bed628ef02b95aca..a27c0840e5b6007befc1ebe6e16d177f6825e1fa 100644 (file)
@@ -35,7 +35,7 @@ endef
 PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
 HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_STATIC
 else
        HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_SHARED
index a1105136a087d318f8294ee73f1253b5b40d2f7b..b77d7b03dae4eb57a3cce708665b42835fb7babe 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PPPD
        bool "pppd"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU
        help
          An implementation of the Point-to-point protocol.
@@ -25,5 +25,5 @@ config BR2_PACKAGE_PPPD_RADIUS
 endif
 
 comment "pppd needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
        depends on BR2_USE_MMU
index f2a272faf4ed9c87cd99fd50e60d9f071550d860..1f89b1317f16afbeb1a0a34099f3d211324c5c85 100644 (file)
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_PROXYCHAINS_NG
        bool "proxychains-ng"
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Force any tcp connections to flow through a proxy (or proxy chain)
 
          https://github.com/rofl0r/proxychains
 
 comment "proxychains-ng needs a toolchain w/ threads, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index a4e965482dfc13e0f34240ece60592e80b7c5c9c..d1d2c4107a78cda1324a237a55b2b50a0754c1d5 100644 (file)
@@ -13,7 +13,7 @@ PTPD2_AUTORECONF = YES
 PTPD2_LICENSE = BSD-2c
 PTPD2_LICENSE_FILES = COPYRIGHT
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        PTPD2_CONF_OPTS += LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
 endif
 
index 100c3d9f54167dd89d1b41d1397abf1fc6598a74..5dbcaae482abdb135085a0ce47e6149309f458d2 100644 (file)
@@ -25,7 +25,7 @@ endif
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 PURE_FTPD_CONF_OPTS += --with-tls
 PURE_FTPD_DEPENDENCIES += openssl
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 PURE_FTPD_CONF_ENV += LIBS='-lssl -lcrypto -lz'
 endif
 else
index b2ab6c8a0fa044c2fd83849a1c8d8959b8333bf6..6c7bc63d762c8330d2344f6ad5718f92a6836d53 100644 (file)
@@ -1,13 +1,13 @@
 comment "python-pam needs a toolchain w/ wchar, locale, dynamic library"
        depends on BR2_PACKAGE_PYTHON
-       depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_PYTHON_PAM
        bool "python-pam"
        depends on BR2_PACKAGE_PYTHON # C extension not compatible with python3
        depends on BR2_ENABLE_LOCALE # linux-pam
        depends on BR2_USE_WCHAR # linux-pam
-       depends on !BR2_PREFER_STATIC_LIB # linux-pam
+       depends on !BR2_STATIC_LIBS # linux-pam
        select BR2_PACKAGE_LINUX_PAM
        help
          PAM (Pluggable Authentication Module) bindings for Python.
index edc4d3454da159aec4d4bed845752fed12f85d6d..4873877693100b17626b842a29ee03007b12d532 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_QDECODER
        bool "qdecoder"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          qDecoder is a simple and powerful CGI library
          for the C/C++ programming language.
index 4f172bd95a455a274f638e200d8892cad75bd60d..f671e88d347ae12bd0a6035715083166257971a3 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_QHULL
        bool "qhull"
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Qhull computes the convex hull, Delaunay triangulation,
          Voronoi diagram, halfspace intersection about a point,
@@ -16,4 +16,4 @@ config BR2_PACKAGE_QHULL
 
 comment "qhull needs a toolchain w/ C++, dynamic library"
        depends on !BR2_INSTALL_LIBSTDCPP
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 184c283e837564e3d1c843f85e5bea4cc37657f3..c6d4f390aaf705f1159a5bd4b0e67c3ad221c289 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_QLIBC
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_WCHAR
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          qLibc is currently one of the most functionally complete
          public licensed C/C++ libraries.  The C/C++ library which
@@ -14,4 +14,4 @@ config BR2_PACKAGE_QLIBC
          https://github.com/wolkykim/qlibc
 
 comment "qlibc needs a toolchain w/ threads, wchar, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS
index 665725eefd50f59b7c1327045a221ad65587be02..543d8070b7fe8a7efe3b83c14dd1bcf78827c982 100644 (file)
@@ -48,7 +48,7 @@ choice
 
 config BR2_PACKAGE_QT_SHARED
        bool "Shared library"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Create and use shared Qt libraries.
          If you have multiple programs that depend on Qt or intend to use
index 6ea7301a9d6aa6acf107d6073d04a012e50832d4..7b334b4bd557a536eb0ae500f2f73b5a23d92ef4 100644 (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
index 788b2d78ebe9a6693ac530f4f60edba32a26a7a6..a36359d4fc2b22144f16746eb16b432974f7037d 100644 (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)
index 20778dc2f396ffecb97c5cd49568d1fb0358d0a8..de660ca23dc948c12655e9d980071bb4ae3f816f 100644 (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
index 34dd14a50d9d48583553f3c0bf28c9661d55e105..19288014ef430a77499c1dbe938e963687873e70 100644 (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
index c33a4054b82feff358daa918eb844e7b3e757d6d..36b499b9c75726ed4591588b52099e94b0d6dc52 100644 (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
index c4049c7b3fbe92ee214d1c82d14bb07138e9b8c4..4126f9f117c59d5dd494e3f4b395e6cb222ff549 100644 (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
index da26c03a2205efd6bbcfbb2eb9cc541e183446af..4588f48fe06ac0fb75ae87887c7ddf5abef24f13 100644 (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
index 32656bed406caefb4a4dfbb85b9b31fc04752062..c44a15fe0a494ed561a61dab4b7173ff0b757e62 100644 (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
index a80995c54aaf8db979166556336881208f245c45..18067fd34cd8368c8dfb75ebc2ca706fe629432b 100644 (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
index 4cc0c9930a89055164d84dcf373334aaf295e10d..2f6e5678fe4972c53221637ffe875b1eb009aa6a 100644 (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
index 719b64767e5007503dcd4e1d6df9a13c5b2c6b4c..9648ee2a237b8d09c9a509c4253432d05f0702d2 100644 (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
index a768acbedee394a5809a6f99f2e0ffc5c4d1a1f2..8f28540da1e652dceb6742b7b189070bbbf92619 100644 (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/
index 3a5856611ce55061275cd54ad17e61c97ec8bb20..25f0a8567eeb71a241f0deff5fcacf43190cbad4 100644 (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
index 777641417e07f26cd0982ea7e3f58886d72b659e..e3c4cf3bb273a52ffc68406dbe12c5d8e453a598 100644 (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
index fc4beda6d5a290be24a1426e3f48aa76df8eb2ff..1528e88c7899fa78a6ce2d13889f0fab911dd11e 100644 (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
index b0d0b0626d9e29b04a6592867609a8d095424a8d..9f29aa2e028e0d7bb43f7114642e63895d090dce 100644 (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
index c8f2f513f713f520d7326af8cf9db6829fca8b74..00cbac5b65cb9d1008d7c9054faa39f6cdb13d65 100644 (file)
@@ -14,13 +14,13 @@ config BR2_PACKAGE_RSH_REDONE_RLOGIN
 
 config BR2_PACKAGE_RSH_REDONE_RLOGIND
        bool "rlogind"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR
        select BR2_PACKAGE_LINUX_PAM
 
 comment "rlogind needs a toolchain w/ wchar, locale, dynamic library"
        depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
-               || BR2_PREFER_STATIC_LIB
+               || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_RSH_REDONE_RSH
        bool "rsh"
@@ -28,11 +28,11 @@ config BR2_PACKAGE_RSH_REDONE_RSH
 config BR2_PACKAGE_RSH_REDONE_RSHD
        bool "rshd"
        depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_LINUX_PAM
 
 comment "rshd needs a toolchain w/ wchar, locale, dynamic library"
        depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
-               || BR2_PREFER_STATIC_LIB
+               || BR2_STATIC_LIBS
 
 endif
index e8fd0b8612ef457bbaaa3a48620040223f51e036..0e2eccc42a6fc98fb4608d68f5cf57f256258130 100644 (file)
@@ -29,7 +29,7 @@ endif
 
 RTMPDUMP_CFLAGS = $(TARGET_CFLAGS)
 
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ifneq ($(BR2_STATIC_LIBS),y)
 RTMPDUMP_CFLAGS += -fPIC
 else
 RTMPDUMP_SHARED = "SHARED="
index 2191204c099bc0429b3b7fe8ac222080a3675bd3..141db90140c409a53f159a76146ae9c97ce5f646 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_RUBY
        bool "ruby"
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Object Oriented Scripting Language.
 
@@ -10,4 +10,4 @@ config BR2_PACKAGE_RUBY
 
 comment "ruby needs a toolchain w/ wchar, threads, dynamic library"
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index 69995352afdc29fca120be9a95cddfcd02262153..9d700864015ce0a4ffc67e4d1a86a45d4a5945f3 100644 (file)
@@ -46,14 +46,14 @@ config BR2_PACKAGE_SCONESERVER_BLUETOOTH
        depends on BR2_USE_MMU # bluez->dbus
        depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2
        depends on !BR2_avr32 # bluez_utils
-       depends on !BR2_PREFER_STATIC_LIB # bluez_utils
+       depends on !BR2_STATIC_LIBS # bluez_utils
        select BR2_PACKAGE_BLUEZ_UTILS
        help
          Bluetooth module for Sconeserver
 
 comment "bluetooth support 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
 
 config BR2_PACKAGE_SCONESERVER_RSS
        bool "rss"
index 4dc9ad75396de6640294a183f2d4bcb16f88a6f0..025c34afd4e735c7309249c6f0932ca430b33b3b 100644 (file)
@@ -48,7 +48,7 @@ ifeq ($(BR2_PACKAGE_READLINE),y)
        SLANG_DEPENDENCIES += readline
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        SLANG_MAKE_OPTS = static
        SLANG_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static
        SLANG_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static
index ffbe73c2af08be353798ec16204667436e6112f0..67c70bb6f3eeb0df36f718c57457e0f0814fc2df 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SMACK
        bool "smack"
-       depends on !BR2_PREFER_STATIC_LIB # dlfcn.h
+       depends on !BR2_STATIC_LIBS # dlfcn.h
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
        help
@@ -31,5 +31,5 @@ config BR2_PACKAGE_SMACK
          https://github.com/smack-team/smack
 
 comment "smack needs a toolchain w/ dynamic library, threads, headers >= 3.0"
-       depends on BR2_PREFER_STATIC_LIB || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \
                || !BR2_TOOLCHAIN_HAS_THREADS
index ef217f7241e66ca5d23fd20bbbcbbae1968c1c26..9e800fd57ea85e38f0dabfb96d57484ee8c4c3e9 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_SNMPPP
        bool "snmp++"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          SNMP++v3.x is a C++ API which supports SNMP v1, v2c, and v3.
 
@@ -28,4 +28,4 @@ endif
 
 comment "snmp++ needs a toolchain w/ threads, C++, dynamic library"
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index f43685f1a3af03f1691dcd04f37c711b186630b2..21a4f3c3cb5832dc4c790ba43787d24fa68c4968 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_SNOWBALL_HDMISERVICE
        bool "snowball-hdmiservice"
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          HDMI userspace control daemon
 
@@ -11,4 +11,4 @@ config BR2_PACKAGE_SNOWBALL_HDMISERVICE
          http://www.igloocommunity.org
 
 comment "snowball-hdmiservice needs a toolchain w/ threads, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index d633d89dd5262ec7d7f2bb7bf8958ca06c59d81a..03d47527ed06310bbaef9b093dc0d3e008b456c6 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_SNOWBALL_INIT
        # Runtime dependency, needed by snowball startup script
        select BR2_PACKAGE_BLUEZ_UTILS
        depends on !BR2_avr32
-       depends on !BR2_PREFER_STATIC_LIB # bluez_utils
+       depends on !BR2_STATIC_LIBS # bluez_utils
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
@@ -15,4 +15,4 @@ config BR2_PACKAGE_SNOWBALL_INIT
 
 comment "snowball-init 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
index b95e32e1b750b759eae88678a253446566bd6b34..f1fcf69a1bd6f3785bd3d4c495dfaa182f763409 100644 (file)
@@ -50,14 +50,14 @@ comment "client needs a toolchain w/ threads, C++"
 config BR2_PACKAGE_SPICE_GUI
        bool "Enable GUI"
        depends on BR2_PACKAGE_SPICE_CLIENT
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_CEGUI06
        help
          Say 'y' here to enable the Graphical User Interface (GUI)
          start dialog.
 
 comment "gui needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_SPICE_TUNNEL
        bool "Enable network redirection"
index f010ee37b79f7309e38b8bab75d2402294b11732..a4920eb149fdf58a00382a2a1914295d563dbad8 100644 (file)
@@ -39,7 +39,7 @@ endif
 
 SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 SQLITE_CONF_OPTS += --enable-dynamic-extensions=no
 endif
 
index aa7628dca2c7d6d105b652ee3652e6248c70199b..43701a7c2e2a289a5ccf08ef2c6b8f256035feb1 100644 (file)
@@ -9,7 +9,7 @@ config BR2_PACKAGE_SSHFS
        depends on BR2_USE_WCHAR # glib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
        depends on BR2_USE_MMU # libfuse, glib2
-       depends on !BR2_PREFER_STATIC_LIB # libfuse
+       depends on !BR2_STATIC_LIBS # libfuse
        help
          FUSE filesystem client based on the SSH File Transfer Protocol.
 
@@ -17,4 +17,4 @@ config BR2_PACKAGE_SSHFS
 
 comment "sshfs needs a toolchain w/ largefile, wchar, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index b1536c05b8afcc0f38bf8416b76429bb937bd790..4bb801e87462ae63914af136186a11d7e8aa72cf 100644 (file)
@@ -15,12 +15,12 @@ STRESS_AUTORECONF = YES
 # SHARED_STATIC_LIBS_OPTS to tell packages to build static libraries,
 # if supported.
 #
-# If the BR2_PREFER_STATIC_LIB is not defined, we have to specify
+# If the BR2_STATIC_LIBS is not defined, we have to specify
 # --disable-static explicitly to get stress linked dynamically.
 #
 # Also, disable documentation by undefining makeinfo
 STRESS_CONF_OPTS = \
-       $(if $(BR2_PREFER_STATIC_LIB),,--disable-static) \
+       $(if $(BR2_STATIC_LIBS),,--disable-static) \
        MAKEINFO=:
 
 $(eval $(autotools-package))
index d2cadf3852eaf105aa76d07010209b66e8d34f73..3b0f47f459648dd0a56626cd1214ca2e7345c9f7 100644 (file)
@@ -92,7 +92,7 @@ if BR2_PACKAGE_STRONGSWAN_EAP
 
 config BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC
        bool "Enable EAP-SIM smart card backend"
-       depends on !BR2_PREFER_STATIC_LIB # pcsc-lite
+       depends on !BR2_STATIC_LIBS # pcsc-lite
        select BR2_PACKAGE_PCSC_LITE
 
 endif
index dc04bdba5bebb1efd81a2ccc6f24b94b65757f6a..776dad5bf9b1663c56cd7d9d5de5a81c16ac6b43 100644 (file)
@@ -3,7 +3,7 @@ config BR2_PACKAGE_SUBVERSION
        select BR2_PACKAGE_APR
        select BR2_PACKAGE_APR_UTIL
        # apr really needs shared library support
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU # apr
        select BR2_PACKAGE_EXPAT
        select BR2_PACKAGE_NEON
index b57489150efd983fe5972706d39f5ea9bda2eeec..ed59c8db1bb7998627557f6ce7232ced8f944a30 100644 (file)
@@ -13,7 +13,7 @@ config BR2_PACKAGE_SYSTEMD
        depends on BR2_LARGEFILE # util-linux
        depends on BR2_USE_WCHAR # util-linux
        depends on BR2_INET_IPV6
-       depends on !BR2_PREFER_STATIC_LIB # kmod
+       depends on !BR2_STATIC_LIBS # kmod
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
        depends on BR2_USE_MMU # dbus
        select BR2_PACKAGE_HAS_UDEV
index 1acf7d9e30658998a45a9a3e8bb68c6f98cc1aeb..dedeb70b03f93acc4c3605e33e1594d2afc97c77 100644 (file)
@@ -16,7 +16,7 @@ TCPDUMP_DEPENDENCIES = zlib libpcap
 # Patching aclocal.m4
 TCPDUMP_AUTORECONF = YES
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 TCPDUMP_CONF_OPTS += LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
 endif
 
index 955e9ec9c8ec831428efae86e8ebe17684ff82b6..559bd28850cba6a9402cbd312833cf0239eb03d6 100644 (file)
@@ -21,7 +21,7 @@ THRIFT_AUTORECONF = YES
 THRIFT_LICENSE = Apache-2.0
 THRIFT_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 # openssl uses zlib, so we need to explicitly link with it when static
 THRIFT_CONF_ENV += LIBS=-lz
 endif
index 3021307c8059a13272526afb4f2b33530d2fb89f..65c5a1aa266ac382c83b9240f685abce3c6d447b 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_TINYALSA
        bool "tinyalsa"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          a small library to interface with ALSA in the Linux kernel
 
@@ -14,4 +14,4 @@ config BR2_PACKAGE_TINYALSA
          https://github.com/tinyalsa/tinyalsa
 
 comment "tinyalsa needs toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 8b3bc5f7f1cc7f16325e93f800016c7095d134ba..55f896f11d6e873a2e2591beedd985f28a313127 100644 (file)
@@ -4,7 +4,7 @@ config BR2_PACKAGE_TRACE_CMD
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on !BR2_avr32 # AVR32 does not have TLS support
        depends on BR2_USE_MMU # fork()
-       depends on !BR2_PREFER_STATIC_LIB # dlopen()
+       depends on !BR2_STATIC_LIBS # dlopen()
        help
          Command line reader for ftrace.
 
@@ -18,4 +18,4 @@ config BR2_PACKAGE_TRACE_CMD
 comment "trace-cmd needs a toolchain w/ largefile, threads, dynamic library"
        depends on BR2_USE_MMU
        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS \
-               || BR2_PREFER_STATIC_LIB
+               || BR2_STATIC_LIBS
index ee7080724178bc2c23abc488276c5bfb757374f1..050588e834d4c2c444249557095c2934d50363fa 100644 (file)
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_TSLIB
        bool "tslib"
-       depends on !BR2_PREFER_STATIC_LIB # dlopen
+       depends on !BR2_STATIC_LIBS # dlopen
        help
          Tslib is an abstraction layer for touchscreen panel events.
 
          https://github.com/kergoth/tslib
 
 comment "tslib needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 2d95ce1f4d6c39cf3d3fb991eda73a11fdc8c423..2bb699ff298f0f53e028286b9745c5b078a06e5b 100644 (file)
@@ -398,7 +398,7 @@ endif
 # static/shared libs
 #
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED,$(@D)/.config)
 else
 UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED,$(@D)/.config)
@@ -510,7 +510,7 @@ define UCLIBC_INSTALL_TARGET_CMDS
 endef
 
 # STATIC has no ld* tools, only getconf
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 define UCLIBC_INSTALL_UTILS_STAGING
        $(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd
        ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd
index 76505ff343266dcf577fd17c76d2c496bd9b1d13..3eb8bf0cf43e21e8ac4a510f672ec5943be5ae59 100644 (file)
@@ -4,7 +4,7 @@ config BR2_PACKAGE_UDISKS
        depends on BR2_PACKAGE_HAS_UDEV
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2
        depends on BR2_USE_MMU # lvm2
-       depends on !BR2_PREFER_STATIC_LIB # lvm2
+       depends on !BR2_STATIC_LIBS # lvm2
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_GLIB
        depends on BR2_USE_WCHAR # dbus-glib -> glib2
@@ -44,4 +44,4 @@ comment "udisks needs a toolchain w/ wchar, threads, dynamic library"
        depends on !BR2_avr32
        depends on BR2_USE_MMU
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index c7929730102fad0fb8226266d2addd7f7f2f08d0..826a382bc7f5208c920c1bb42a0dd19d4e4500a3 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_ULOGD
        bool "ulogd"
        depends on BR2_INET_IPV6
        depends on BR2_LARGEFILE
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU
        # ulog support removed for kernels >= 3.17
        depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
@@ -17,6 +17,6 @@ config BR2_PACKAGE_ULOGD
          http://www.netfilter.org/projects/ulogd/
 
 comment "ulogd needs a toolchain w/ IPv6, largefile, dynamic library"
-       depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB
+       depends on !BR2_INET_IPV6 || !BR2_LARGEFILE || BR2_STATIC_LIBS
        depends on BR2_USE_MMU
        depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
index de3d341cf3dd7f519a89a0d0815d849dc0650703..ff871d3b60c2ce0ee2eff4cdf35dcd60cb3026c9 100644 (file)
@@ -4,7 +4,7 @@ config BR2_PACKAGE_UNIONFS
        depends on BR2_LARGEFILE
        depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
        depends on BR2_USE_MMU # libfuse
-       depends on !BR2_PREFER_STATIC_LIB # libfuse
+       depends on !BR2_STATIC_LIBS # libfuse
        help
          A userspace unionfs implementation.
 
@@ -12,4 +12,4 @@ config BR2_PACKAGE_UNIONFS
 
 comment "unionfs needs a toolchain w/ largefile, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index d961434016ad89df5468048a57244d42dfc31e28..81140ce856f61d3daa65c98b5e111cf6b346a2cf 100644 (file)
@@ -7,7 +7,7 @@ config BR2_PACKAGE_USHARE
        # ushare has a completely custom configure script that does
        # broken things with library ordering, which breaks static
        # linking.
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          uShare is a UPnP (TM) A/V & DLNA Media Server.
          It implements the server component that provides UPnP media devices
@@ -17,4 +17,4 @@ config BR2_PACKAGE_USHARE
 
 comment "ushare needs a toolchain w/ largefile, threads, dynamic library"
        depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_PREFER_STATIC_LIB
+               BR2_STATIC_LIBS
index c8facef4e2244605361de758369e0459bb2bf157..c08acc9339c7bf80392591b6f971c49a0d2294e1 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_USSP_PUSH
        bool "ussp-push"
        depends on BR2_INET_IPV6
        depends on !BR2_avr32
-       depends on !BR2_PREFER_STATIC_LIB # bluez_utils
+       depends on !BR2_STATIC_LIBS # bluez_utils
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
        depends on BR2_USE_MMU # dbus
@@ -17,4 +17,4 @@ config BR2_PACKAGE_USSP_PUSH
 
 comment "ussp-push needs a toolchain w/ wchar, IPv6, threads, dynamic library"
        depends on !BR2_avr32 && BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_PREFER_STATIC_LIB
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_STATIC_LIBS
index 07e1fbb540ece9287d42a342fa6c61c019242ffe..5dfd050233ee317fe8c8b254f2cbded51fbe4c79 100644 (file)
@@ -55,14 +55,14 @@ config BR2_PACKAGE_UTIL_LINUX_ARCH
 config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH
        bool "chfn/chsh"
        depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_LINUX_PAM
        help
          Change login shell, real user name and information
 
 comment "chfn/chsh needs a toolchain w/ wchar, locale, dynamic library"
        depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
-               || BR2_PREFER_STATIC_LIB
+               || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_UTIL_LINUX_CRAMFS
        bool "cramfs utilities"
@@ -99,14 +99,14 @@ config BR2_PACKAGE_UTIL_LINUX_KILL
 config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
        bool "login utilities"
        depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_LINUX_PAM
        help
          Build login utilities (last, login, su, sulogin)
 
 comment "login utilities needs a toolchain w/ wchar, locale, dynamic library"
        depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
-               || BR2_PREFER_STATIC_LIB
+               || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_UTIL_LINUX_LOSETUP
        bool "losetup"
index 18ff2e4bc841c1aee0bf10ebb306cb5452b42dc3..f640a4ae2a907b341e9019ae64feca460832dd03 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_VDE2
        bool "vde2"
        depends on BR2_USE_MMU # fork()
-       depends on !BR2_PREFER_STATIC_LIB # dlopen()
+       depends on !BR2_STATIC_LIBS # dlopen()
        help
          VDE is an ethernet compliant virtual network that can be
          spawned over a set of physical computers over the Internet.
@@ -11,4 +11,4 @@ config BR2_PACKAGE_VDE2
 
 comment "vde2 needs a toolchain w/ dynamic library"
        depends on BR2_USE_MMU
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 19f1058dfa4788d831f107345f31ead1b27babca..901f06d34c0fa11f88984b6c5c5c985263013f44 100644 (file)
@@ -45,7 +45,7 @@ VLC_CONF_OPTS += \
        --disable-opencv
 
 # Building static and shared doesn't work, so force static off.
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 VLC_CONF_OPTS += --disable-static
 endif
 
index f90cda66146d2628fc7356d8240d1afc96ff8afb..f58a2834dd5cd39bd6cf06299c2e87a5668890a4 100644 (file)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_WAYLAND
        bool "wayland"
        depends on !BR2_avr32 # no epoll_create1, timerfd_create or timerfd_settime
-       depends on !BR2_PREFER_STATIC_LIB # dlfcn.h
+       depends on !BR2_STATIC_LIBS # dlfcn.h
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_LIBFFI
        select BR2_PACKAGE_EXPAT
@@ -14,4 +14,4 @@ config BR2_PACKAGE_WAYLAND
 
 comment "wayland needs a toolchain w/ threads, dynamic library"
        depends on !BR2_avr32
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
index cf242d126032e1940d144b94796f8c659587d2d5..5fff5bd861051c19ae3aada71e39686be1aead71 100644 (file)
@@ -2,7 +2,7 @@ comment "weston needs udev and a toolchain w/ threads, dynamic library, headers
        depends on !BR2_avr32
        depends on BR2_ARCH_HAS_ATOMICS
        depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \
-               !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_PREFER_STATIC_LIB
+               !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_WESTON
        bool "weston"
@@ -15,7 +15,7 @@ config BR2_PACKAGE_WESTON
        select BR2_PACKAGE_MTDEV
        depends on BR2_PACKAGE_HAS_UDEV
        depends on !BR2_avr32 # wayland
-       depends on !BR2_PREFER_STATIC_LIB # wayland
+       depends on !BR2_STATIC_LIBS # wayland
        depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
        depends on BR2_ARCH_HAS_ATOMICS # cairo
index 0968fd34ec27afe118d17200422cabe44a323c29..e33af25b86a3a5f8ec0cb0c6a54b6ad3e9b89fe0 100644 (file)
@@ -9,7 +9,7 @@ if BR2_PACKAGE_WIRELESS_TOOLS
 
 config BR2_PACKAGE_WIRELESS_TOOLS_LIB
        bool "Install shared library"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          The shared library of wireless tools
 
index 311262ddf18445e3b8610a7b6b7a57032e7016f0..0c4abb59cb31dd9d7d9770aa4df232925468e17b 100644 (file)
@@ -32,7 +32,7 @@ WPA_SUPPLICANT_CONFIG_DISABLE = \
 # And library order matters hence stick -lnl-3 first since it's appended
 # in the wpa_supplicant Makefiles as in LIBS+=-lnl-3 ... thus failing
 ifeq ($(BR2_PACKAGE_LIBNL),y)
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        WPA_SUPPLICANT_LIBS += -lnl-3 -lm -lpthread
 endif
        WPA_SUPPLICANT_DEPENDENCIES += libnl
@@ -66,7 +66,7 @@ endif
 # Try to use openssl if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
        WPA_SUPPLICANT_DEPENDENCIES += openssl
-       WPA_SUPPLICANT_LIBS += $(if $(BR2_PREFER_STATIC_LIB),-lcrypto -lz)
+       WPA_SUPPLICANT_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz)
        WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
 else
        WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD
index 17b7b0ef865ef956a1776f1ff641cb6aa4e6ce0a..1630ff034225b7034a6c8ac1fc1772118d063bd2 100644 (file)
@@ -28,7 +28,7 @@ WVSTREAMS_CONF_OPTS += \
 # needed for openssl detection when statically linking (as ssl needs lz)
 WVSTREAMS_CONF_ENV += LIBS=-lz
 
-ifneq ($(BR2_PREFER_STATIC_LIB),y)
+ifneq ($(BR2_STATIC_LIBS),y)
        WVSTREAMS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
 endif
 
index 357d4b4834b4242c8009093d882648ad2da1ece0..2fd1ff062b28c19ee75b59aafdc230a4021fb3c1 100644 (file)
@@ -2,7 +2,7 @@ menuconfig BR2_PACKAGE_XORG7
        bool "X.org X Window System"
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB # dlopen in xlib_libX11
+       depends on !BR2_STATIC_LIBS # dlopen in xlib_libX11
        help
          Support for X11R7 libraries, servers, drivers, and/or
          applications in the target.
@@ -264,4 +264,4 @@ if BR2_PACKAGE_XORG7
 endif
 
 comment "X.org needs a toolchain w/ wchar, threads, dynamic library"
-       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
index 7cf5926adb319b28cf9989e46446490126c1fa1d..9c6e2961537c70e4eac1409403eda4d3f73e2f0d 100644 (file)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
        bool "xf86-input-tslib"
-       depends on !BR2_PREFER_STATIC_LIB # tslib
+       depends on !BR2_STATIC_LIBS # tslib
        select BR2_PACKAGE_XPROTO_INPUTPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO
        select BR2_PACKAGE_XPROTO_XPROTO
@@ -11,4 +11,4 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
          http://www.ptxdist.org/software/xf86-input-tslib/index_en.html
 
 comment "xf86-input-tslib needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
index 7060ac1755439bdbf4476426faf248c3436c9a54..6352ba39a34dabac837903e0e55143b4e65a5d7e 100644 (file)
@@ -22,7 +22,7 @@ else
 X264_CONF_OPTS += --disable-asm
 endif
 
-ifeq ($(BR2_PREFER_STATIC_LIB),)
+ifeq ($(BR2_STATIC_LIBS),)
 X264_CONF_OPTS += --enable-pic --enable-shared
 endif
 
index a7337d5fe0c36f875ef55e768753d17d158a14f5..95de89d735adc07b81fd01c2cb9ec9789fba0e8d 100644 (file)
@@ -111,7 +111,7 @@ config BR2_PACKAGE_XBMC_ALSA_LIB
 
 config BR2_PACKAGE_XBMC_AVAHI
        bool "avahi"
-       depends on !BR2_PREFER_STATIC_LIB # avahi
+       depends on !BR2_STATIC_LIBS # avahi
        select BR2_PACKAGE_AVAHI
        select BR2_PACKAGE_AVAHI_DAEMON
        help
@@ -127,13 +127,13 @@ config BR2_PACKAGE_XBMC_DBUS
 config BR2_PACKAGE_XBMC_LIBBLURAY
        bool "blu-ray"
        select BR2_PACKAGE_LIBBLURAY
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Enable Blu-ray input support.
          Select this if you want to play back Blu-ray content.
 
 comment "libbluray support needs a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_XBMC_GOOM
        bool "goom screensaver"
@@ -155,7 +155,7 @@ comment "rsxs needs an OpenGL backend"
 
 config BR2_PACKAGE_XBMC_LIBCEC
        bool "hdmi cec"
-       depends on !BR2_PREFER_STATIC_LIB # libcec
+       depends on !BR2_STATIC_LIBS # libcec
        depends on BR2_PACKAGE_HAS_UDEV
        select BR2_PACKAGE_LIBCEC
        help
@@ -163,7 +163,7 @@ config BR2_PACKAGE_XBMC_LIBCEC
          Select this if you want XBMC to support HDMI CEC.
 
 comment "hdmi cec support needs udev /dev management and a toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_HAS_UDEV
+       depends on BR2_STATIC_LIBS || !BR2_PACKAGE_HAS_UDEV
 
 config BR2_PACKAGE_XBMC_LIBMICROHTTPD
        bool "web server"
@@ -219,12 +219,12 @@ config BR2_PACKAGE_XBMC_LIBUSB
 config BR2_PACKAGE_XBMC_LIBVA
        bool "va"
        select BR2_PACKAGE_LIBVA
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          Enable libva support.
 
 comment "libva support needs toolchain w/ dynamic library"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_XBMC_WAVPACK
        bool "wavpack"
index abed7e851fa2c8f04f57f1a205b5dacf2c84defb..d6b849a1c9b05bbf8e72982f374de3f451717134 100644 (file)
@@ -10,7 +10,7 @@ XL2TP_DEPENDENCIES = libpcap openssl
 XL2TP_LICENSE = GPLv2
 XL2TP_LICENSE_FILES = LICENSE
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 XL2TP_LDLIBS = LDLIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
 endif
 
index 9386d4a64f81b6f4c691b04dfe93d94cd66381fc..bc2b37740b645cf252db27eafe01a0e4971a3176 100644 (file)
@@ -17,7 +17,7 @@ XMLSTARLET_CONF_OPTS += \
        --with-libxslt-prefix=${STAGING_DIR}/usr \
        --with-libiconv-prefix=${STAGING_DIR}/usr
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 XMLSTARLET_CONF_OPTS += --enable-static-libs
 else
 XMLSTARLET_CONF_OPTS += --disable-static-libs
index 987c65be35f470dad828550105eee7dd0f4ad94a..e8f7c57720144852784d53c8187ce9c734650e21 100644 (file)
@@ -15,7 +15,7 @@ ZEROMQ_AUTORECONF = YES
 
 # Only tools/curve_keygen.c needs this, but it doesn't hurt to pass it
 # for the rest of the build as well (which automatically includes stdc++).
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
        ZEROMQ_CONF_OPTS += LIBS=-lstdc++
 endif
 
index 19accd26d333102b5ec92fc9c969ef32bb20ca18..7c849cd53c01caf1b118015612cc6eaf15b6938f 100644 (file)
@@ -11,7 +11,7 @@ ZLIB_LICENSE = zlib license
 ZLIB_LICENSE_FILES = README
 ZLIB_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PREFER_STATIC_LIB),y)
+ifeq ($(BR2_STATIC_LIBS),y)
 ZLIB_PIC =
 ZLIB_SHARED = --static
 else
index 4217370a085d62523f709fa23f7ccc98fa5346f4..f9c7839791039e4796a3d5c588883bcf6a476cac 100644 (file)
@@ -2,7 +2,7 @@ config BR2_PACKAGE_ZLOG
        bool "zlog"
        depends on BR2_LARGEFILE
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        help
          zlog is a reliable, high-performance, thread safe, flexible,
          clear-model, pure C logging library.
@@ -10,4 +10,4 @@ config BR2_PACKAGE_ZLOG
          https://github.com/HardySimpson/zlog
 
 comment "zlog needs a toolchain w/ threads, largefile, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || BR2_PREFER_STATIC_LIB
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE || BR2_STATIC_LIBS
index 590c2153de9aa792ea98bb6efccf6d876a25a9e4..d2e0563094da302440d25ce826c18b2efbddb499 100755 (executable)
@@ -632,7 +632,7 @@ while (my ($distname, $dist) = each %dist) {
         open my $fh, q{>}, $cfgname;
         say {$fh} qq{config BR2_PACKAGE_${brname}};
         say {$fh} qq{\tbool "${fsname}"};
-        say {$fh} qq{\tdepends on !BR2_PREFER_STATIC_LIB} if $need_dlopen{$distname};
+        say {$fh} qq{\tdepends on !BR2_STATIC_LIBS} if $need_dlopen{$distname};
         foreach my $dep (sort @{$deps_runtime{$distname}}) {
             my $brdep = brname( fsname( $dep ) );
             say {$fh} qq{\tselect BR2_PACKAGE_${brdep}};
@@ -642,7 +642,7 @@ while (my ($distname, $dist) = each %dist) {
         say {$fh} qq{\t  ${homepage}};
         if ($need_dlopen{$distname}) {
             say {$fh} qq{\ncomment "${fsname} needs a toolchain w/ dynamic library"};
-            say {$fh} qq{\tdepends on BR2_PREFER_STATIC_LIB};
+            say {$fh} qq{\tdepends on BR2_STATIC_LIBS};
         }
         close $fh;
     }
index 39f27c706e903afd946c7af73cb7bfe3ca7cb478..a3b7aff36a0ac03298c6901b1d943204e79c8f83 100644 (file)
@@ -95,7 +95,7 @@ config BR2_INIT_SYSTEMD
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_TOOLCHAIN_HAS_SSP
        depends on BR2_USE_MMU
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
        select BR2_PACKAGE_SYSTEMD
 
@@ -127,14 +127,14 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV
        depends on !BR2_avr32 # eudev
        depends on BR2_LARGEFILE
        depends on BR2_USE_WCHAR
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU # eudev
        select BR2_PACKAGE_EUDEV
 
 comment "eudev needs a toolchain w/ largefile, wchar, dynamic library"
        depends on !BR2_avr32 # eudev
        depends on BR2_USE_MMU
-       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_PREFER_STATIC_LIB
+       depends on !BR2_LARGEFILE || !BR2_USE_WCHAR || BR2_STATIC_LIBS
 
 endchoice
 
index 53d86dd8e9da3030b2b575c13ac9cc097f9e50a0..2955b2ed14fe798062dcff7b3e01fc47ebf25960 100644 (file)
@@ -47,7 +47,7 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC
                   BR2_sh     || BR2_sh64     || BR2_sparc   || \
                   BR2_x86_64 || BR2_microblaze || BR2_powerpc64
        depends on BR2_USE_MMU
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_USES_GLIBC
        # our eglibc.mk enables RPC support
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -66,7 +66,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
                   BR2_sh64        || BR2_sparc    || BR2_x86_64  || \
                   BR2_microblaze
        depends on BR2_USE_MMU
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on !BR2_powerpc_SPE
        select BR2_TOOLCHAIN_USES_GLIBC
        # our glibc.mk enables RPC support
@@ -78,7 +78,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
          http://www.gnu.org/software/libc/
 
 comment "(e)glibc only available with shared lib support"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_BUILDROOT_MUSL
        bool "musl (experimental)"
index 2e9352bc2141593db9450b75ffade737f2218231..50daa66ba4dd4340122955d73767b74f77aa3348 100644 (file)
@@ -4,7 +4,7 @@ choice
        prompt "Toolchain"
 
 comment "(e)glibc toolchains only available with shared lib support"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM
        bool "Linaro ARM 2014.09"
@@ -12,7 +12,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM
        depends on BR2_ARM_CPU_ARMV7A
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on BR2_ARM_EABIHF
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -30,7 +30,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM
 comment "Linaro toolchains available for Cortex-A + EABIhf"
        depends on BR2_arm
        depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB
        bool "Linaro armeb 2014.09"
@@ -38,7 +38,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB
        depends on BR2_ARM_CPU_ARMV7A
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on BR2_ARM_EABIHF
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -56,14 +56,14 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB
 comment "Linaro toolchains available for Cortex-A + EABIhf"
        depends on BR2_armeb
        depends on !BR2_ARM_CPU_ARMV7A || !BR2_ARM_EABIHF
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201405
        bool "Sourcery CodeBench ARM 2014.05"
        depends on BR2_arm
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on BR2_ARM_EABI
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -90,7 +90,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201311
        depends on BR2_arm
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on BR2_ARM_EABI
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_HAS_GCC_BUG_58595 # based-on gcc-4.8.1
        select BR2_TOOLCHAIN_HAS_GCC_BUG_58854 # based-on gcc-4.8.1
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
@@ -119,7 +119,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
        depends on BR2_arm
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on BR2_ARM_EABI
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_HAS_GCC_BUG_58595 # based-on gcc-4.7.3
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -145,7 +145,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305
 comment "Sourcery CodeBench toolchains available for the EABI ABI"
        depends on BR2_arm
        depends on !BR2_ARM_EABI
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
        bool "Arago ARMv7 2011.09"
@@ -154,7 +154,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV7A_201109
        depends on BR2_ARM_CPU_ARMV7A
        depends on BR2_ARM_EABI
        depends on BR2_ARM_CPU_HAS_VFPV3 || BR2_ARM_CPU_MAYBE_HAS_VFPV3
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -176,7 +176,7 @@ config BR2_TOOLCHAIN_EXTERNAL_ARAGO_ARMV5TE_201109
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on !BR2_ARM_CPU_ARMV4
        depends on BR2_ARM_EABI
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -193,7 +193,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201411
        depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on !BR2_MIPS_NABI32
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -278,7 +278,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201405
        depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on !BR2_MIPS_NABI32
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -363,7 +363,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201311
        depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
        depends on !BR2_MIPS_NABI32
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -445,13 +445,13 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201311
 
 comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64"
        depends on BR2_MIPS_NABI32
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
        bool "Sourcery CodeBench Nios-II 2014.05"
        depends on BR2_nios2
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -466,7 +466,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
        bool "Sourcery CodeBench Nios-II 2013.05"
        depends on BR2_nios2
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -482,7 +482,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201203
        depends on BR2_powerpc
        depends on BR2_powerpc_SPE
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -499,7 +499,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103
        bool "Sourcery CodeBench PowerPC 2011.03"
        depends on BR2_powerpc
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -531,7 +531,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
        bool "Sourcery CodeBench PowerPC 2010.09"
        depends on BR2_powerpc
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -563,7 +563,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201209
        bool "Sourcery CodeBench SH 2012.09"
        depends on BR2_sh4a || BR2_sh4aeb
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -587,7 +587,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201203
        bool "Sourcery CodeBench SH 2012.03"
        depends on BR2_sh4a || BR2_sh4aeb
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_INSTALL_LIBSTDCPP
        select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -610,7 +610,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
        bool "Sourcery CodeBench SH 2011.03"
        depends on BR2_sh4a || BR2_sh4aeb
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
        select BR2_INSTALL_LIBSTDCPP
@@ -674,7 +674,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201209
        bool "Sourcery CodeBench x86/x86_64 2012.09"
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on !BR2_x86_jaguar
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -701,7 +701,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201203
        bool "Sourcery CodeBench x86/x86_64 2012.03"
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on !BR2_x86_jaguar
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_INSTALL_LIBSTDCPP
@@ -727,7 +727,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_201109
        bool "Sourcery CodeBench x86/x86_64 2011.09"
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on !BR2_x86_jaguar
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -808,7 +808,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3
        bool "Xilinx Little Endian Microblaze GNU Tools 14.3"
        depends on BR2_microblazeel
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_DEPRECATED_SINCE_2014_02
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -823,7 +823,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2
        bool "Xilinx Little Endian Microblaze GNU Tools v2"
        depends on BR2_microblazeel
        depends on BR2_HOSTARCH = "x86_64"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_DEPRECATED_SINCE_2014_02
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -836,7 +836,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_14_3
        bool "Xilinx Big Endian Microblaze GNU Tools"
        depends on BR2_microblazebe
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_DEPRECATED_SINCE_2014_02
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -851,7 +851,7 @@ config BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2
        bool "Xilinx Big Endian Microblaze GNU Tools"
        depends on BR2_microblazebe
        depends on BR2_HOSTARCH = "x86_64"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        depends on BR2_DEPRECATED_SINCE_2014_02
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_TOOLCHAIN_HAS_NATIVE_RPC
@@ -864,7 +864,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64
        bool "Linaro AArch64 14.09"
        depends on BR2_aarch64
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_INSTALL_LIBSTDCPP
        select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -878,7 +878,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64
        bool "CodeSourcery AArch64 2014.05"
        depends on BR2_aarch64
        depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        select BR2_INSTALL_LIBSTDCPP
        select BR2_HOSTARCH_NEEDS_IA32_LIBS
@@ -1135,7 +1135,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC
        bool "glibc/eglibc"
-       depends on !BR2_PREFER_STATIC_LIB
+       depends on !BR2_STATIC_LIBS
        select BR2_TOOLCHAIN_EXTERNAL_GLIBC
        help
          Select this option if your external toolchain uses the GNU C
@@ -1148,7 +1148,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC
          cause build failures to some packages.
 
 comment "(e)glibc only available with shared lib support"
-       depends on BR2_PREFER_STATIC_LIB
+       depends on BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL
        bool "musl"
index 992d0cba338cd8cefc1a0396b22397280a0f30c4..b07b16ccb718e7c5f07c273e88202709af3f5efb 100644 (file)
@@ -554,7 +554,7 @@ define TOOLCHAIN_EXTERNAL_INSTALL_CORE
                fi ; \
        fi ; \
        ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
-       if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \
+       if test -z "$(BR2_STATIC_LIBS)" ; then \
                $(call MESSAGE,"Copying external toolchain libraries to target...") ; \
                for libs in $(LIB_EXTERNAL_LIBS); do \
                        $(call copy_toolchain_lib_root,$${ARCH_SYSROOT_DIR},$${SUPPORT_LIB_DIR},$${ARCH_LIB_DIR},$$libs,/lib); \