From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 4 Oct 2013 14:52:17 +0000 (+0200)
Subject: qtwebkit: Export RUBYLIB to fix wrong paths hardcoded in native ruby
X-Git-Tag: rev_ivi_2015_02_04~1023
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56b1f5f5acaab8df1a50c4f1760e56582a58eb37;p=scm%2Fbb%2Ftizen-distro.git

qtwebkit: Export RUBYLIB to fix wrong paths hardcoded in native ruby

* when ruby-native is reused from sstate it can contain paths pointing
  to wrong sysroot

(From meta-qt5 rev: d6fc754ac4145b0edf0d4bb62af1018d67ad1b64)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-qt5/recipes-qt/qt5/qtwebkit.inc b/meta-qt5/recipes-qt/qt5/qtwebkit.inc
index 458eb92..c0e0648 100644
--- a/meta-qt5/recipes-qt/qt5/qtwebkit.inc
+++ b/meta-qt5/recipes-qt/qt5/qtwebkit.inc
@@ -15,3 +15,9 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
 PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
 
 SRC_URI += "file://fix-rpath.patch"
+
+# make sure rb files are used from sysroot, not from host
+# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/`
+# we need to replace it too (a bit longer version without importing re)
+RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
+export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"