]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/efl: fix unmet dependencies
authorYann E. MORIN <yann.morin.1998@free.fr>
Mon, 8 May 2017 21:11:49 +0000 (23:11 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 15 May 2017 12:00:01 +0000 (14:00 +0200)
EFL's elput selects libinput but forgot to propagate its dependencies.
Which requires they be propagated further to a second sub-option, then
to a third one.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Romain Naour <romain.naour@openwide.fr>
[Thomas: fix typoes.]
[Peter: fix more typoes]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit 31bd2b46a83f6009518935e11b4136668bd4d330)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/efl/Config.in

index 5e89af602c662440eac5c4f1ac8f73150e6039d8..a91609d5f5840801c87948a16dda4573584e8baa 100644 (file)
@@ -179,12 +179,14 @@ config BR2_PACKAGE_EFL_WAYLAND
        depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine
        depends on BR2_PACKAGE_EFL_EEZE # efl drm
        depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only
+       depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- libinput
        select BR2_PACKAGE_EFL_DRM
 
-comment "Wayland support needs udev /dev management (eeze) and OpenGL ES w/ EGL, threads"
+comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales"
        depends on BR2_PACKAGE_WAYLAND
        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \
-               || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE
+               || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE \
+               || !BR2_ENABLE_LOCALE
 
 choice
        bool "OpenGL support"
@@ -216,6 +218,7 @@ endchoice # OpenGL support
 
 config BR2_PACKAGE_EFL_ELPUT
        bool "Elput"
+       depends on BR2_ENABLE_LOCALE # libinput
        depends on BR2_PACKAGE_EFL_EEZE
        select BR2_PACKAGE_LIBINPUT
        select BR2_PACKAGE_LIBXKBCOMMON
@@ -225,23 +228,24 @@ config BR2_PACKAGE_EFL_ELPUT
          ecore_drm, etc) to handle interfacing with libinput without
          having to duplicate the code in each subsystem.
 
-comment "Elput support needs udev /dev management (eeze)"
-       depends on !BR2_PACKAGE_EFL_EEZE
+comment "Elput support needs udev /dev management (eeze), locales"
+       depends on !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE
 
 config BR2_PACKAGE_EFL_DRM
        bool "Evas DRM Engine"
        depends on BR2_PACKAGE_EFL_EEZE
        depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm
        depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d
+       depends on BR2_ENABLE_LOCALE # efl-elput <- libinput
        select BR2_PACKAGE_EFL_ELPUT
        select BR2_PACKAGE_LIBDRM
        select BR2_PACKAGE_LIBXKBCOMMON
        help
          This option enable building support for the Evas DRM Engine.
 
-comment "Evas DRM Engine needs udev /dev management (eeze) and mesa3d w/ EGL support, threads"
+comment "Evas DRM Engine needs udev /dev management (eeze), mesa3d w/ EGL support, threads, locales"
        depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \
-               || !BR2_PACKAGE_EFL_EEZE
+               || !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE
 
 comment "libevas loaders"