Patchwork [meta-gnome] abiword: force build order

login
register
mail settings
Submitter Trevor Woerner
Date April 10, 2014, 2:12 a.m.
Message ID <1397095971-17039-2-git-send-email-trevor.woerner@linaro.org>
Download mbox | patch
Permalink /patch/70413/
State Accepted, archived
Headers show

Comments

Trevor Woerner - April 10, 2014, 2:12 a.m.
There is a race condition whereby "libgoffice.la" must be built (and exist)
before the rest of the code in "src" is built.

Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
---
 meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
Martin Jansa - April 20, 2014, 9:29 a.m.
On Wed, Apr 09, 2014 at 10:12:51PM -0400, Trevor Woerner wrote:
> There is a race condition whereby "libgoffice.la" must be built (and exist)
> before the rest of the code in "src" is built.

Merged, thanks

> 
> Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
> ---
>  meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
> index 69d62ef..073622a 100644
> --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
> +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
> @@ -50,6 +50,14 @@ do_configure() {
>      autotools_do_configure
>  }
>  
> +do_compile() {
> +    cd ${S}/goffice-bits2
> +    make goffice-paths.h
> +    make libgoffice.la
> +    cd ${S}
> +    oe_runmake
> +}
> +
>  PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
>  
>  FILES_${PN} += " \
> -- 
> 1.9.0
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
index 69d62ef..073622a 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.0.bb
@@ -50,6 +50,14 @@  do_configure() {
     autotools_do_configure
 }
 
+do_compile() {
+    cd ${S}/goffice-bits2
+    make goffice-paths.h
+    make libgoffice.la
+    cd ${S}
+    oe_runmake
+}
+
 PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
 
 FILES_${PN} += " \