diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2017-02-19 21:07:26 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-22 13:16:52 +0100 |
commit | b323ddd9036c835e8c49111fd738e746b3164a74 (patch) | |
tree | 579a10e0aa2cf1704154f2f0092aafff6e2d4ac3 /meta-oe/recipes-support/xdg-user-dirs | |
parent | 96b07df2422aa6bffbf60a85d91ec0acb4f88035 (diff) | |
download | meta-openembedded-b323ddd9036c835e8c49111fd738e746b3164a74.tar.gz |
xdg-user-dirs: fix build by disabling building of man pages and unblacklist
Have tried adding several native dependenciesbut gut no successful build.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Diffstat (limited to 'meta-oe/recipes-support/xdg-user-dirs')
-rw-r--r-- | meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb | 5 |
2 files changed, 34 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch b/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch new file mode 100644 index 000000000..b2b0e4998 --- /dev/null +++ b/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 41093d9634bfeddcaec866745d8d4022f4c6f8c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Sun, 19 Feb 2017 21:01:39 +0100 | ||
4 | Subject: [PATCH] explicitly disable man generation --disable-documentation is | ||
5 | not enough | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
13 | --- | ||
14 | Makefile.am | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/Makefile.am b/Makefile.am | ||
18 | index c01c54f..dcdf7a2 100644 | ||
19 | --- a/Makefile.am | ||
20 | +++ b/Makefile.am | ||
21 | @@ -1,6 +1,6 @@ | ||
22 | NULL = | ||
23 | |||
24 | -SUBDIRS=po man | ||
25 | +SUBDIRS=po | ||
26 | |||
27 | INCLUDES = \ | ||
28 | -I$(top_srcdir) \ | ||
29 | -- | ||
30 | 2.9.3 | ||
31 | |||
diff --git a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb index 22b4bb612..c05675976 100644 --- a/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb +++ b/meta-oe/recipes-support/xdg-user-dirs/xdg-user-dirs_0.15.bb | |||
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | |||
4 | 4 | ||
5 | SRC_URI = " \ | 5 | SRC_URI = " \ |
6 | http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz \ | 6 | http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz \ |
7 | file://0001-explicitly-disable-man-generation-disable-documentat.patch \ | ||
7 | file://xdg-user-dirs.desktop \ | 8 | file://xdg-user-dirs.desktop \ |
8 | " | 9 | " |
9 | SRC_URI[md5sum] = "f5aaf5686ad7d8809a664bfb4566a54d" | 10 | SRC_URI[md5sum] = "f5aaf5686ad7d8809a664bfb4566a54d" |
@@ -11,6 +12,8 @@ SRC_URI[sha256sum] = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916 | |||
11 | 12 | ||
12 | inherit autotools gettext | 13 | inherit autotools gettext |
13 | 14 | ||
15 | EXTRA_OECONF = "--disable-documentation" | ||
16 | |||
14 | do_install_append () { | 17 | do_install_append () { |
15 | install -d ${D}${sysconfdir}/xdg/autostart | 18 | install -d ${D}${sysconfdir}/xdg/autostart |
16 | install -m 644 ${WORKDIR}/xdg-user-dirs.desktop ${D}${sysconfdir}/xdg/autostart | 19 | install -m 644 ${WORKDIR}/xdg-user-dirs.desktop ${D}${sysconfdir}/xdg/autostart |
@@ -20,5 +23,3 @@ CONFFILES_${PN} += " \ | |||
20 | ${sysconfdir}/xdg/user-dirs.conf \ | 23 | ${sysconfdir}/xdg/user-dirs.conf \ |
21 | ${sysconfdir}/xdg/user-dirs.defaults \ | 24 | ${sysconfdir}/xdg/user-dirs.defaults \ |
22 | " | 25 | " |
23 | |||
24 | PNBLACKLIST[xdg-user-dirs] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130635/" | ||