ruby: find gems relative to its own location
PATCH 1/2 ruby: find gems relative to its own location
Rather than hardcoding ${datadir}/rubygems, we can let it find the gems relative to its own location, to make it relocatable.
Signed-off-by Christopher Larson <[email protected]>
--- meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-ruby/recipes-devtools/ruby/ruby_1.9.3-p429.bb +1 -1
@@ -17,10 +17,10 @@ SRC_URI[sha256sum] = "d192d1afc46a7ef27b9d0a3c7a67b509048984db2c38907aa82641bdf9 EXTRA_OECONF = "\ --enable-wide-getaddrinfo \ - --with-rubygemsdir=${datadir}/rubygems \ --disable-versioned-paths \ --disable-rpath \ --enable-shared \ + --enable-load-relative \ " EXTRA_OEMAKE = " \
Signature · 1 line
1.8.3.4
PATCH 2/2 lmbench: fix the CONFIG path in lmbench-run
The 'config' script which gets run returns '../scripts/CONFIG.<machine>', so the current value was '${datadir}/lmbench/../scripts/CONFIG.<machine>', which is obviously not ideal. Remove the $SHAREDIR prefix, as the relative path will work from the scripts dir where lmbench-run runs. With this, we can install a custom CONFIG.qemux86 into ${datadir}/lmbench/scripts/, for example.
Signed-off-by Christopher Larson <[email protected]>
--- meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +1 -1
@@ -55,7 +55,7 @@ do_install () { install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \ -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' \ - -e 's,^CONFIG=.*$,CONFIG=$SHAREDIR/`$SCRIPTSDIR/config`,;' \ + -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ ${D}${bindir}/lmbench-run install -m 0755 ${S}/scripts/lmbench ${D}${bindir} install -m 0755 ${S}/scripts/* ${D}${datadir}/lmbench/scripts
Signature · 1 line
1.8.3.4