Patchwork [1/2] groff: Fix sstate relocation issue

login
register
mail settings
Submitter Saul Wold
Date Sept. 4, 2011, 4:19 a.m.
Message ID <9f4240fffc8748f28e2d4ce6a6c88dee30ab9ddd.1315109841.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/10965/
State New, archived
Headers show

Comments

Saul Wold - Sept. 4, 2011, 4:19 a.m.
[YOCTO #1439]

This fixes a problem where the native groff has a path hard coded into
it, therefor add a wrapper to set the command line with the correct
paths for fonts and tmac directories.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/groff/groff_1.20.1.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Phil Blundell - Sept. 4, 2011, 5:58 p.m.
On Sat, 2011-09-03 at 21:19 -0700, Saul Wold wrote:
> +	create_cmdline_wrapper ${D}/${bindir}/groff \
> +		-F${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/font \
> +		-M${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/tmac
> +}

Shouldn't that be ${datadir}?

p.
Richard Purdie - Sept. 5, 2011, 4:48 p.m.
On Sun, 2011-09-04 at 18:58 +0100, Phil Blundell wrote:
> On Sat, 2011-09-03 at 21:19 -0700, Saul Wold wrote:
> > +	create_cmdline_wrapper ${D}/${bindir}/groff \
> > +		-F${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/font \
> > +		-M${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/tmac
> > +}
> 
> Shouldn't that be ${datadir}?

or datadir_native :)

I'll pull and amend the patch with that change.

Cheers,

Richard

Patch

diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb
index 7085911..3e24253 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.20.1.bb
@@ -4,7 +4,7 @@  formatting commands and produces formatted output."
 SECTION = "base"
 HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
 LICENSE = "GPLv2"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
@@ -34,4 +34,11 @@  do_configure_prepend() {
 	fi
 }
 
+do_install_append_virtclass-native() {
+	create_cmdline_wrapper ${D}/${bindir}/groff \
+		-F${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/font \
+		-M${STAGING_DIR_NATIVE}/usr/share/groff/${PV}/tmac
+}
+
+
 BBCLASSEXTEND = "native"