summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2016-02-07 23:35:29 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-02-15 10:21:36 +0100
commit4d60de68a2cc775586b8f7a015064abdcce7d6cd (patch)
tree33482f5aec8d4ceed834193d9b6f38f199101c91 /meta-gnome
parent5f5b1b6667346dbb1477ddfa1fb54aae391bb14e (diff)
downloadmeta-openembedded-4d60de68a2cc775586b8f7a015064abdcce7d6cd.tar.gz
abiword: make build deterministic for meta-office [1] in layers
The conditional DEPENDS was added for opendocument-plugin. Problem solving this by PACKAGECONFIG is that --enable-plugins enables all plugins. Changing that to --enable-plugins=<list of plugins> is a list which needs maintenance for future versions of abiword. The change affects users adding meta-office in their layers only. These tend to building libreoffice which DEPENDS on the additional DEPENDS set her anyway - so there is not much additional build for these users. [1] https://github.com/schnitzeltony/meta-office Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb9
1 files changed, 7 insertions, 2 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
index d4c8c56c9..962a56cb9 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
@@ -4,7 +4,8 @@ SECTION = "x11/office"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20" 5LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
6DEPENDS = "perl-native wv libglade libfribidi jpeg libpng \ 6DEPENDS = "perl-native wv libglade libfribidi jpeg libpng \
7 librsvg libwmf-native gtkmathview asio gtk+ evolution-data-server" 7 librsvg libwmf-native gtkmathview asio gtk+ evolution-data-server \
8 ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)}"
8RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ 9RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
9 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" 10 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
10RCONFLICTS_${PN} = "${PN}-embedded" 11RCONFLICTS_${PN} = "${PN}-embedded"
@@ -24,7 +25,11 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
24 25
25inherit autotools-brokensep pkgconfig 26inherit autotools-brokensep pkgconfig
26 27
27PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp" 28PACKAGECONFIG ??= " \
29 collab-backend-xmpp collab-backend-tcp \
30 ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libical', '', d)} \
31"
32PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2"
28PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant" 33PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
29PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth" 34PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth"
30PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2" 35PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2"