From 8df46686a8e3cc8a9b1681d6d47b898ab937d998 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 18 Apr 2014 22:53:01 +0200 Subject: efl: explicitly depend on lua5.1 * even with luajit in DEPENDS, old lua5.1. was referenced from pkg-config and other recipes were failing when trying to use edje without lua5.1 in sysroot, e.g. cpu, e-tasks, e-wm, e-wm-config-illume2-shr, diskio Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/efl/efl.inc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'meta-efl') diff --git a/meta-efl/recipes-efl/efl/efl.inc b/meta-efl/recipes-efl/efl/efl.inc index 56b3cd21ec..929fc20f0c 100644 --- a/meta-efl/recipes-efl/efl/efl.inc +++ b/meta-efl/recipes-efl/efl/efl.inc @@ -2,8 +2,8 @@ SUMMARY = "EFL" LICENSE = "MIT BSD LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a1809a807e39dd48ddcf7be98477d130" -DEPENDS_class-native = "lua5.1-native freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native" -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" +DEPENDS_class-native = "freetype-native libxext-native libpng-native jpeg-native tiff-native libfribidi-native glib-2.0-native dbus-native" +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" inherit efl gettext pkgconfig @@ -42,8 +42,8 @@ EXTRA_OECONF_append_class-native = " \ --disable-image-loader-xpm \ " -PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio" -PACKAGECONFIG_class-native = "" +PACKAGECONFIG ?= "opengl-es gstreamer1 pulseaudio lua-old" +PACKAGECONFIG_class-native = "lua-old" # sort of tri-state PACKAGECONFIG[opengl-full] = "--with-opengl=full,,virtual/libgl" @@ -53,8 +53,14 @@ PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" PACKAGECONFIG[gstreamer1] = "--enable-gstreamer1,--disable-gstreamer1,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" -# we don't have luajit-native now, so use old lua for -native +# we don't have luajit-native now, so use old lua for -native and +# for target it's also currently failing with luajit +# | /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 +# | /OE/build/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libluajit-5.1.a: error adding symbols: Bad value +# | collect2: error: ld returned 1 exit status +# | Makefile:12007: recipe for target 'lib/edje/libedje.la' failed PACKAGECONFIG[luajit] = "--disable-lua-old,--enable-lua-old,luajit" +PACKAGECONFIG[lua-old] = "--enable-lua-old,--disable-lua-old,lua5.1" # 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 do_configure_prepend_class-native() { -- cgit 1.2.3-korg