t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-16 20:21:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2013-10-04 16:52:17 +02:00
parent 3a84535bcb
commit fad74f159d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
recipes-qt/qt5/qtwebkit.inc
View File

@@ -14,3 +14,9 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
INC_PR = "r0"
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}"