aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/utouch
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-08-15 10:09:24 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-22 15:49:24 +0200
commit0fcdae1683771356a488a1b3fdd8fc27c13009c0 (patch)
tree92a0d3512134d21130385c604d175c354d69cbad /meta-oe/recipes-support/utouch
parent469a6ca5b82bbb9488bed9177a9674537ab15171 (diff)
downloadmeta-openembedded-contrib-0fcdae1683771356a488a1b3fdd8fc27c13009c0.tar.gz
utouch-frame: fix build errors associated with xmllint
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/utouch')
-rw-r--r--meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch16
-rw-r--r--meta-oe/recipes-support/utouch/utouch-frame_git.bb6
2 files changed, 18 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch b/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch
new file mode 100644
index 0000000000..8706d91234
--- /dev/null
+++ b/meta-oe/recipes-support/utouch/files/remove-man-page-creation.patch
@@ -0,0 +1,16 @@
+configure.ac: never generate the docs even if a2x is found as xmllint will fail finding custom dtd files
+
+Upstream-Status: Inappropriate [embedded specific]
+
+Signed-off-by: Derek Straka <derek@asterius.io>
+--- git/configure.ac.orig 2016-08-15 09:53:46.787003658 -0400
++++ git/configure.ac 2016-08-15 09:53:51.698972432 -0400
+@@ -37,7 +37,7 @@
+ ])
+
+ AC_CHECK_PROG([ASCIIDOC], [a2x], [a2x])
+-AM_CONDITIONAL([HAVE_DOCTOOLS], [test "x$ASCIIDOC" != "x"])
++AM_CONDITIONAL([HAVE_DOCTOOLS], [false])
+ AS_IF([test "x$ASCIIDOC" = "x"],
+ [AC_MSG_WARN([asciidoc not installed, man pages will not be created])])
+
diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb
index 8fc873371c..6ec566ddb2 100644
--- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb
@@ -9,12 +9,10 @@ DEPENDS += "mtdev utouch-evemu"
inherit autotools pkgconfig
-SRC_URI = "git://bitmath.org/git/frame.git;protocol=http"
+SRC_URI = "git://bitmath.org/git/frame.git;protocol=http \
+ file://remove-man-page-creation.patch"
SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc"
PV = "1.1.2+git${SRCPV}"
S = "${WORKDIR}/git/"
-
-# http://errors.yoctoproject.org/Errors/Details/74486/
-PNBLACKLIST[utouch-frame] ?= "BROKEN: Fails to execute xmllint"