[oe-commits] Martin Jansa : mkvtoolnix: inherit gettext and export RUBYLIB

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: dylan
Commit: 11e44bdc9a642c2cbdbec154431be1be220665e5
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=11e44bdc9a642c2cbdbec154431be1be220665e5

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Jul 21 13:00:12 2013 +0200

mkvtoolnix: inherit gettext and export RUBYLIB

* fails to call msgfmt in do_compile:
  MSGFMT po/cs.po
  ERROR: Function failed: do_compile (see mkvtoolnix/5.9.0-r0/temp/log.do_compile.3794 for further information)
* fails to find rubygems.rb:
  <internal:gem_prelude>:1:in `require': cannot load such file rubygems.rb (LoadError)

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb     |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
index 13edaa9..0106594 100644
--- a/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
+++ b/meta-multimedia/recipes-mkv/mkvtoolnix/mkvtoolnix_5.9.0.bb
@@ -10,7 +10,13 @@ SRC_URI = "http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-${PV}.
 SRC_URI[md5sum] = "033621461ef8eb922fc1366e0a9a6f16"
 SRC_URI[sha256sum] = "d913f531331c3332d2fb334c872ea19bfea7293dfedc4bf33ae7162e4efcbde1"
 
-inherit autotools
+inherit autotools gettext
+
+# 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}"
 
 EXTRA_OECONF = " --with-boost-libdir=${STAGING_LIBDIR} \
 "