Patchwork [2/2] opensp: Fix sstate relocation issue

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

Comments

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

This fixes a problem where the native nsgmls has a path hard coded into
it, therefor add a wrapper to set the environment with the correct
paths for catalog files.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-devtools/opensp/opensp_1.5.bb |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
Saul Wold - Sept. 6, 2011, 3:55 a.m.
On 09/03/2011 09:19 PM, Saul Wold wrote:
> [YOCTO #1439]
>
> This fixes a problem where the native nsgmls has a path hard coded into
> it, therefor add a wrapper to set the environment with the correct
> paths for catalog files.
>
> Signed-off-by: Saul Wold<sgw@linux.intel.com>
> ---
>   meta/recipes-devtools/opensp/opensp_1.5.bb |    9 ++++++++-
>   1 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
> index a402d11..0269c87 100644
> --- a/meta/recipes-devtools/opensp/opensp_1.5.bb
> +++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
> @@ -5,7 +5,7 @@ SECTION = "libs"
>   LICENSE = "BSD"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
>
> -PR = "r1"
> +PR = "r2"
>
>   # At -Os it encounters calls to some inline functions which are then
>   # not found in any other objects with gcc 4.5
> @@ -42,6 +42,13 @@ do_install_append() {
>   	ln -sf osx sgml2xml
>   }
>
> +do_install_append_virtclass-native() {
> +	for util in nsgmls sgmlnorm spam spcat spent sx; do
> +		create_wrapper ${D}/${bindir}/$util \
> +		    SGML_CATALOG_FILES=${sysconfdir}/sgml/catalog
> +	done
> +}
> +
>   FILES_${PN} += "${datadir}/OpenSP/"
>
>   BBCLASSEXTEND = "native"

I found an issue with this patch, as it stands right now the 
linuxdoc-tools-native failes to build with this patch.

If I change the pass the catalog directory via -D, then the iputils goes 
back to failing!  It seems that some more work might be needed and 
possibly a patch to the opensp catalog search mode.  What I saw 
happening is it seems to pick up the command line path for the index.db 
and incorporates it with the catalog search path.

More digging is needed.

Sau!

Patch

diff --git a/meta/recipes-devtools/opensp/opensp_1.5.bb b/meta/recipes-devtools/opensp/opensp_1.5.bb
index a402d11..0269c87 100644
--- a/meta/recipes-devtools/opensp/opensp_1.5.bb
+++ b/meta/recipes-devtools/opensp/opensp_1.5.bb
@@ -5,7 +5,7 @@  SECTION = "libs"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
 
-PR = "r1"
+PR = "r2"
 
 # At -Os it encounters calls to some inline functions which are then
 # not found in any other objects with gcc 4.5
@@ -42,6 +42,13 @@  do_install_append() {
 	ln -sf osx sgml2xml
 }
 
+do_install_append_virtclass-native() {
+	for util in nsgmls sgmlnorm spam spcat spent sx; do
+		create_wrapper ${D}/${bindir}/$util \
+		    SGML_CATALOG_FILES=${sysconfdir}/sgml/catalog 
+	done
+}
+
 FILES_${PN} += "${datadir}/OpenSP/"
 
 BBCLASSEXTEND = "native"