diff options
| -rw-r--r-- | meta-efl/recipes-efl/efl/efl.inc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index f307ff9dba..7ccb6347d1 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc | |||
| @@ -44,8 +44,8 @@ EXTRA_OECONF_append_class-native = " \ | |||
| 44 | --disable-image-loader-xpm \ | 44 | --disable-image-loader-xpm \ |
| 45 | " | 45 | " |
| 46 | 46 | ||
| 47 | PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio lua-old" | 47 | PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio luajit" |
| 48 | PACKAGECONFIG_class-native = "lua-old" | 48 | PACKAGECONFIG_class-native = "luajit" |
| 49 | 49 | ||
| 50 | # sort of tri-state | 50 | # sort of tri-state |
| 51 | PACKAGECONFIG[opengl-full] = "--with-opengl=full,,virtual/libgl" | 51 | PACKAGECONFIG[opengl-full] = "--with-opengl=full,,virtual/libgl" |
| @@ -58,14 +58,8 @@ PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" | |||
| 58 | PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base" | 58 | PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base" |
| 59 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" | 59 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" |
| 60 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | 60 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" |
| 61 | # we don't have luajit-native now, so use old lua for -native and | ||
| 62 | # for target it's also currently failing with luajit | ||
| 63 | # | /OE/build/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/core2-64-oe-linux/gcc/x86_64-oe-linux/4.8.2/ld: /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libluajit-5.1.a(lj_err.o): relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC | ||
| 64 | # | /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libluajit-5.1.a: error adding symbols: Bad value | ||
| 65 | # | collect2: error: ld returned 1 exit status | ||
| 66 | # | Makefile:12007: recipe for target 'lib/edje/libedje.la' failed | ||
| 67 | PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit" | 61 | PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit" |
| 68 | PACKAGECONFIG[lua-old] = "--enable-lua-old,--disable-lua-old,lua5.1" | 62 | PACKAGECONFIG[lua-old] = "--enable-lua-old,--disable-lua-old,lua" |
| 69 | 63 | ||
| 70 | # new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need | 64 | # new efl doesn't have option to disable eeze build and we don't want to provide udev-native just to build eeze-native we don't need |
| 71 | do_configure_prepend_class-native() { | 65 | do_configure_prepend_class-native() { |
