From 2c342c11ce26a09c63c127bedab9230ea97cc481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 15 Apr 2017 01:04:12 +0200
Subject: [PATCH] libreoffice: fix build with rssi oe-core
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-libreoffice/libreoffice/libreoffice-native.bb | 2 +-
 recipes-libreoffice/libreoffice/libreoffice.bb        | 2 +-
 recipes-libreoffice/libreoffice/libreoffice.inc       | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/recipes-libreoffice/libreoffice/libreoffice-native.bb b/recipes-libreoffice/libreoffice/libreoffice-native.bb
index 01f7e6a..538754c 100644
--- a/recipes-libreoffice/libreoffice/libreoffice-native.bb
+++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb
@@ -100,7 +100,7 @@ EXTRA_OECONF += " \
 do_configure() {
     olddir=`pwd`
     cd ${S}
-    aclocal --system-acdir=${WORKDIR}/aclocal-copy/ -I ${S}/m4
+    aclocal --system-acdir=${STAGING_DATADIR_NATIVE}/aclocal/ -I ${S}/m4
     gnu-configize
     autoconf
     cd $olddir
diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb
index 50b9148..6f7e838 100644
--- a/recipes-libreoffice/libreoffice/libreoffice.bb
+++ b/recipes-libreoffice/libreoffice/libreoffice.bb
@@ -168,7 +168,7 @@ PACKAGECONFIG[postgresql] = "--enable-postgresql-sdbc --with-system-postgresql,
 do_configure() {
     olddir=`pwd`
     cd ${S}
-    aclocal --system-acdir=${WORKDIR}/aclocal-copy/ -I ${S}/m4
+    aclocal --system-acdir=${STAGING_DATADIR_NATIVE}/aclocal/ -I ${S}/m4
     gnu-configize
     autoconf
     cd $olddir
diff --git a/recipes-libreoffice/libreoffice/libreoffice.inc b/recipes-libreoffice/libreoffice/libreoffice.inc
index b6abfdf..6bacad2 100644
--- a/recipes-libreoffice/libreoffice/libreoffice.inc
+++ b/recipes-libreoffice/libreoffice/libreoffice.inc
@@ -18,7 +18,14 @@ SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
 
 inherit autotools-brokensep pkgconfig distutils-base perlnative
 
-DEPENDS = "python3-lxml-native ccache-native archive-zip-native gperf-native bison-native"
+DEPENDS += " \
+    python3-lxml-native \
+    ccache-native \
+    archive-zip-native \
+    gperf-native \
+    bison-native \
+    zip-native \
+"
 
 EXTRA_OECONF = " \
     --without-doxygen \