diff options
Diffstat (limited to 'meta-efl/recipes-efl')
-rw-r--r-- | meta-efl/recipes-efl/efl/efl.inc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index 56b3cd21e..929fc20f0 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc | |||
@@ -2,8 +2,8 @@ SUMMARY = "EFL" | |||
2 | LICENSE = "MIT BSD LGPL-2.1" | 2 | LICENSE = "MIT BSD LGPL-2.1" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a1809a807e39dd48ddcf7be98477d130" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a1809a807e39dd48ddcf7be98477d130" |
4 | 4 | ||
5 | DEPENDS_class-native = "lua5.1-native freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native" | 5 | DEPENDS_class-native = "freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native" |
6 | DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 luajit dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native" | 6 | DEPENDS = "virtual/libiconv tslib curl glib-2.0 gnutls pkgconfig zlib jpeg openssl libsndfile1 dbus libexif librsvg freetype libpng tiff libxext virtual/libx11 libxrender fontconfig libfribidi giflib udev libxcursor libxcomposite libxinerama libxrandr libxtst libxscrnsaver efl-native" |
7 | 7 | ||
8 | inherit efl gettext pkgconfig | 8 | inherit efl gettext pkgconfig |
9 | 9 | ||
@@ -42,8 +42,8 @@ EXTRA_OECONF_append_class-native = " \ | |||
42 | --disable-image-loader-xpm \ | 42 | --disable-image-loader-xpm \ |
43 | " | 43 | " |
44 | 44 | ||
45 | PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio" | 45 | PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio lua-old" |
46 | PACKAGECONFIG_class-native = "" | 46 | PACKAGECONFIG_class-native = "lua-old" |
47 | 47 | ||
48 | # sort of tri-state | 48 | # sort of tri-state |
49 | PACKAGECONFIG[opengl-full] = "--with-opengl=full,,virtual/libgl" | 49 | PACKAGECONFIG[opengl-full] = "--with-opengl=full,,virtual/libgl" |
@@ -53,8 +53,14 @@ PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" | |||
53 | PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base" | 53 | PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base" |
54 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" | 54 | PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" |
55 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | 55 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" |
56 | # we don't have luajit-native now, so use old lua for -native | 56 | # we don't have luajit-native now, so use old lua for -native and |
57 | # for target it's also currently failing with luajit | ||
58 | # | /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 | ||
59 | # | /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libluajit-5.1.a: error adding symbols: Bad value | ||
60 | # | collect2: error: ld returned 1 exit status | ||
61 | # | Makefile:12007: recipe for target 'lib/edje/libedje.la' failed | ||
57 | PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit" | 62 | PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit" |
63 | PACKAGECONFIG[lua-old] = "--enable-lua-old,--disable-lua-old,lua5.1" | ||
58 | 64 | ||
59 | # 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 | 65 | # 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 |
60 | do_configure_prepend_class-native() { | 66 | do_configure_prepend_class-native() { |