mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

efl: explicitly depend on lua5.1

Browse Source 
* 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 <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2014-04-18 22:53:01 +02:00
parent b1278bfe91
commit 8df46686a8
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-efl/recipes-efl/efl/efl.inc
+11 -5
View File
@@ -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() {