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:43:51 +0200 |
| commit | 09e9947b4cb7ea2f2cb4610a5b3c15e81cb7c72d (patch) | |
| tree | ead6decfa0170de63b3a6bc954a136e9b61e6ccf /recipes-qt/qt5 | |
| parent | d38371ffb83757685789adeeacd46154756085f5 (diff) | |
| download | meta-qt5-09e9947b4cb7ea2f2cb4610a5b3c15e81cb7c72d.tar.gz | |
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/qt5')
| -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}" | |||
| 15 | 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 " | 15 | 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 " |
| 16 | 16 | ||
| 17 | SRC_URI += "file://fix-rpath.patch" | 17 | SRC_URI += "file://fix-rpath.patch" |
| 18 | |||
| 19 | # make sure rb files are used from sysroot, not from host | ||
| 20 | # ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/` | ||
| 21 | # we need to replace it too (a bit longer version without importing re) | ||
| 22 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | ||
| 23 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | ||