diff options
| -rw-r--r-- | package/efl/Config.in | 10 | ||||
| -rw-r--r-- | package/efl/efl.mk | 17 |
2 files changed, 13 insertions, 14 deletions
diff --git a/package/efl/Config.in b/package/efl/Config.in index 88e2c360f7..7fc26e48a4 100644 --- a/package/efl/Config.in +++ b/package/efl/Config.in @@ -2,8 +2,7 @@ config BR2_PACKAGE_EFL bool "efl" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HAS_UDEV # libudev - # https://phab.enlightenment.org/T2728 - depends on BR2_PACKAGE_LUA_5_1 # needs lua 5.1, broken with 5.2+ + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads depends on BR2_USE_MMU depends on BR2_USE_WCHAR # use wchar_t @@ -13,6 +12,8 @@ config BR2_PACKAGE_EFL select BR2_PACKAGE_JPEG # Emile needs libjpeg select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + # https://phab.enlightenment.org/T2728 + select BR2_PACKAGE_LUAJIT # Lua support broken select BR2_PACKAGE_UTIL_LINUX # libblkid is part of required tools, see EFL's README. select BR2_PACKAGE_UTIL_LINUX_LIBBLKID @@ -184,8 +185,5 @@ endif # BR2_PACKAGE_EFL comment "efl needs udev /dev management and a toolchain w/ C++, dynamic library, threads, wchar" depends on !BR2_PACKAGE_HAS_UDEV || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - depends on BR2_USE_MMU - -comment "efl needs lua 5.1" - depends on !BR2_PACKAGE_LUA_5_1 + depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on BR2_USE_MMU diff --git a/package/efl/efl.mk b/package/efl/efl.mk index 2ea2592115..916999d830 100644 --- a/package/efl/efl.mk +++ b/package/efl/efl.mk @@ -19,8 +19,8 @@ EFL_LICENSE_FILES = \ EFL_INSTALL_STAGING = YES -EFL_DEPENDENCIES = host-pkgconf host-efl dbus freetype jpeg lua udev \ - util-linux zlib +EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ + jpeg luajit udev util-linux zlib # Regenerate the autotools: # - to fix an issue in eldbus-codegen: https://phab.enlightenment.org/T2718 @@ -29,19 +29,20 @@ EFL_GETTEXTIZE = YES # Configure options: # --disable-cxx-bindings: disable C++11 bindings. +# --disable-lua-old: build elua for the target. # --disable-sdl: disable sdl2 support. # --disable-systemd: disable systemd support. # --disable-xinput22: disable X11 XInput v2.2+ support. -# --enable-lua-old: disable Elua and remove luajit dependency. # --with-opengl=none: disable opengl support. EFL_CONF_OPTS = \ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ + --with-elua=$(HOST_DIR)/usr/bin/elua \ --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \ --disable-cxx-bindings \ + --disable-lua-old \ --disable-sdl \ --disable-systemd \ --disable-xinput22 \ - --enable-lua-old \ --with-opengl=none # Disable untested configuration warning. @@ -227,7 +228,7 @@ $(eval $(autotools-package)) # * host-freetype: for libevas # * host-libglib2: for libecore # * host-libjpeg, host-libpng: for libevas image loader -# * host-lua: disable luajit dependency +# * host-luajit for Elua tool for the host HOST_EFL_DEPENDENCIES = \ host-pkgconf \ host-dbus \ @@ -235,7 +236,7 @@ HOST_EFL_DEPENDENCIES = \ host-libglib2 \ host-libjpeg \ host-libpng \ - host-lua \ + host-luajit \ host-zlib # Configure options: @@ -246,10 +247,10 @@ HOST_EFL_DEPENDENCIES = \ # --disable-gstreamer1: remove dependency on gtreamer 1.0. # --disable-libeeze: remove libudev dependency. # --disable-libmount: remove dependency on host-util-linux libmount. +# --disable-lua-old: build elua for the host. # --disable-physics: remove Bullet dependency. # --enable-image-loader-gif=no: disable Gif dependency. # --enable-image-loader-tiff=no: disable Tiff dependency. -# --enable-lua-old: disable Elua and remove luajit dependency. # --with-crypto=none: remove dependencies on openssl or gnutls. # --with-x11=none: remove dependency on X.org. # Yes I really know what I am doing. @@ -261,13 +262,13 @@ HOST_EFL_CONF_OPTS += \ --disable-gstreamer1 \ --disable-libeeze \ --disable-libmount \ + --disable-lua-old \ --disable-multisense \ --disable-physics \ --enable-image-loader-gif=no \ --enable-image-loader-jpeg=yes \ --enable-image-loader-png=yes \ --enable-image-loader-tiff=no \ - --enable-lua-old \ --with-crypto=none \ --with-glib=yes \ --with-opengl=none \ |
