diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-04 16:52:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-05 14:42:19 +0200 |
| commit | d6fc754ac4145b0edf0d4bb62af1018d67ad1b64 (patch) | |
| tree | f511bf8f33a5d602d0865c81bd779f1f96f3b391 /recipes-qt | |
| parent | d691c447784646688b3b0445d63359a7d9292926 (diff) | |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index 458eb92a..c0e06480 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/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}" |