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-contrib-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 0000000000..b2b0e49988 --- /dev/null +++ b/meta-oe/recipes-support/xdg-user-dirs/files/0001-explicitly-disable-man-generation-disable-documentat.patch @@ -0,0 +1,31 @@ +From 41093d9634bfeddcaec866745d8d4022f4c6f8c1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Sun, 19 Feb 2017 21:01:39 +0100 +Subject: [PATCH] explicitly disable man generation --disable-documentation is + not enough +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index c01c54f..dcdf7a2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + NULL = + +-SUBDIRS=po man ++SUBDIRS=po + + INCLUDES = \ + -I$(top_srcdir) \ +-- +2.9.3 + 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 22b4bb6129..c05675976d 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" SRC_URI = " \ http://user-dirs.freedesktop.org/releases/${BPN}-${PV}.tar.gz \ + file://0001-explicitly-disable-man-generation-disable-documentat.patch \ file://xdg-user-dirs.desktop \ " SRC_URI[md5sum] = "f5aaf5686ad7d8809a664bfb4566a54d" @@ -11,6 +12,8 @@ SRC_URI[sha256sum] = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916 inherit autotools gettext +EXTRA_OECONF = "--disable-documentation" + do_install_append () { install -d ${D}${sysconfdir}/xdg/autostart install -m 644 ${WORKDIR}/xdg-user-dirs.desktop ${D}${sysconfdir}/xdg/autostart @@ -20,5 +23,3 @@ CONFFILES_${PN} += " \ ${sysconfdir}/xdg/user-dirs.conf \ ${sysconfdir}/xdg/user-dirs.defaults \ " - -PNBLACKLIST[xdg-user-dirs] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130635/" |