diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-03 22:41:29 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-12-11 22:48:13 +0100 |
| commit | 665e13c85e1fd216499cdd335a88a4d1c20f175f (patch) | |
| tree | 5ecc87c54905105b96cbe9891028ef8eb3d713b1 /package/mesa3d | |
| parent | 2d23d40279be39f70553974de11a5fc088622911 (diff) | |
| download | buildroot-665e13c85e1fd216499cdd335a88a4d1c20f175f.tar.gz buildroot-665e13c85e1fd216499cdd335a88a4d1c20f175f.zip | |
Rename BR2_PREFER_STATIC_LIB to BR2_STATIC_LIBS
Since a while, the semantic of BR2_PREFER_STATIC_LIB has been changed
from "prefer static libraries when possible" to "use only static
libraries". The former semantic didn't make much sense, since the user
had absolutely no control/idea of which package would use static
libraries, and which packages would not. Therefore, for quite some
time, we have been starting to enforce that BR2_PREFER_STATIC_LIB
should really build everything with static libraries.
As a consequence, this patch renames BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS, and adjust the Config.in option accordingly.
This also helps preparing the addition of other options to select
shared, shared+static or just static.
Note that we have verified that this commit can be reproduced by
simply doing a global rename of BR2_PREFER_STATIC_LIB to
BR2_STATIC_LIBS plus adding BR2_PREFER_STATIC_LIB to Config.in.legacy.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Diffstat (limited to 'package/mesa3d')
| -rw-r--r-- | package/mesa3d/Config.in | 6 | ||||
| -rw-r--r-- | package/mesa3d/mesa3d.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 74ebbed602..eb977b6510 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -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 diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 8dfad6cc53..f57012b945 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -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 |
