summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2014-04-05 14:10:07 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-04-16 19:59:25 +0200
commit7e2ba248c62dd48c4f24b71e16c4cc1601596b5f (patch)
tree35b49f0445cacd5a885200b3e2786aa0c9cb55d9
parent77d6e6ac2a74bc591cdfcadcb1d2f3e79a4469a0 (diff)
downloadbuildroot-7e2ba248c62dd48c4f24b71e16c4cc1601596b5f.tar.gz
buildroot-7e2ba248c62dd48c4f24b71e16c4cc1601596b5f.zip
package/mesa3d: fix improper dependency of blind option
Currently, the blind option BR2_PACKAGE_MESA3D_DRI_DRIVER depends on !STATIC. But this option is also selected by the various DRI drivers, and none of them currently depend on !STATIC (although there is a comment stating DRI drivers need !STATIC, there's nothing to enforce that). So, we could well end-up with an inconsistent configuration, where some DRI drivers are selected even though STATIC is set. Enclose all DRI drivers in an 'if !STATIC' condition, remove the dependency from the blind option, move the comment so it is nearer the affected drivers, rephrase the comment to match the rules about dependencies on toolchain features. [Thomas: really use the right wording for the comment about the dynamic library dependency.] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Paul Cercueil <paul@crapouillou.net> Cc: Bernd Kuhls <berndkuhls@hotmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/mesa3d/Config.in11
1 files changed, 7 insertions, 4 deletions
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 54aca4b562..81f2272866 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -26,12 +26,8 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
config BR2_PACKAGE_MESA3D_DRI_DRIVER
select BR2_PACKAGE_MESA3D_DRIVER
- depends on !BR2_PREFER_STATIC_LIB
bool
-comment "DRI drivers need shared libdrm"
- depends on BR2_PREFER_STATIC_LIB
-
config BR2_PACKAGE_MESA3D_DRIVER
bool
@@ -60,6 +56,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
This is a software opengl implementation using the Gallium3D
infrastructure.
+comment "DRI drivers needs a toolchain w/ dynamic library"
+ depends on BR2_PREFER_STATIC_LIB
+
+if !BR2_PREFER_STATIC_LIB
+
config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
bool "DRI swrast driver"
select BR2_PACKAGE_MESA3D_DRI_DRIVER
@@ -84,6 +85,8 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
help
Legacy Radeon driver for R100 series GPUs.
+endif # !BR2_PREFER_STATIC_LIB
+
endmenu
menu "Additional API Support"
OpenPOWER on IntegriCloud