mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

gnome-power-manager: fix compile

Browse Source 
* on some machines help crashed with:
| xsltproc -o gnome-power-manager-C.omf --stringparam db2omf.basename gnome-power-manager --stringparam db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML V4.3//EN" --stringparam db2omf.lang C --stringparam db2omf.omf_dir "/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help" --stringparam db2omf.omf_in "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnome-power-manager/2.32.0-r2/gnome-power-manager-2.32.0/help/gnome-power-manager.omf.in"  /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils` C/gnome-power-manager.xml || { rm -f "gnome-power-manager-C.omf"; exit 1; }
| unable to parse fr/gnome-power-manager.xml

* disable man in recipe did not work

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Andreas Müller
2013-04-29 13:14:29 +02:00
committed by Martin Jansa
parent 2491bccb6d
commit 376a5b381f
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch
+37
View File
@@ -0,0 +1,37 @@
From 3ed15a3c6ae4ab94c7e3af306644bb5d7f3fd1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 29 Apr 2013 13:08:10 +0200
Subject: [PATCH] Makefile.am: don't build help/man
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
help crashes with:
| xsltproc -o gnome-power-manager-C.omf --stringparam db2omf.basename gnome-power-manager --stringparam db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML V4.3//EN" --stringparam db2omf.lang C --stringparam db2omf.omf_dir "/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help" --stringparam db2omf.omf_in "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnome-power-manager/2.32.0-r2/gnome-power-manager-2.32.0/help/gnome-power-manager.omf.in" /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils` C/gnome-power-manager.xml || { rm -f "gnome-power-manager-C.omf"; exit 1; }
| unable to parse fr/gnome-power-manager.xml
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile.am | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 005b8a0..5b9e318 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,7 @@ SUBDIRS = \
src \
po \
docs \
- man \
data \
- help \
policy \
tools
--
1.7.6.5
meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb
+5 -6
View File
@@ -2,14 +2,17 @@ DESCRIPTION = "Power management daemon"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
PR = "r3"
PR = "r4"
DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower"
RRECOMMENDS_${PN} += "gnome-keyring"
inherit gnome
SRC_URI += "file://sysrooted-pkg-config.patch"
SRC_URI += " \
file://sysrooted-pkg-config.patch \
file://0001-Makefile.am-don-t-build-help-man.patch \
"
SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda"
SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476"
@@ -23,10 +26,6 @@ EXTRA_OECONF = " --disable-scrollkeeper \
ac_cv_header_X11_extensions_dpms_h=yes \
"
do_configure_prepend() {
sed -i -e 's: man ::g' ${S}/Makefile.am
}
do_configure_append() {
rm config.log
# Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror