diff options
author | Scott Garman <scott.a.garman@intel.com> | 2011-03-05 14:20:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-06 08:56:26 -0800 |
commit | 9ebf8f9d191f1f378e3b22ca20a44da06a6ab2de (patch) | |
tree | 851aa7dd842124b77e62d9d20a7b9566596b376f | |
parent | b43e5d302969fb0a21eb5b9f97e78797af00b9a2 (diff) | |
download | poky-9ebf8f9d191f1f378e3b22ca20a44da06a6ab2de.tar.gz |
linuxdoc-tools-native: Fix build error with txt documentation
Disable building txt documentation. This is a temporary workaround,
as I have found an Ubuntu 10.10 system which throws errors during
building this that I'd like to ultimately fix. The error manifests
itself from the end of LinuxDocTools.pm with the following messages
during do_install:
| - Building txt docs
| Processing file ./guide
| troff: fatal error: can't find macro file s
| fmt_txt::postASP: Empty output file, error when calling groff. Aborting...
(From OE-Core rev: affd8315fd37cf187e0646d7417b57ce38c78296)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch | 32 | ||||
-rw-r--r-- | meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch new file mode 100644 index 0000000000..17c7670170 --- /dev/null +++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Disable building txt documentation. This is a temporary workaround, | ||
2 | as I have found an Ubuntu 10.10 system which throws errors during | ||
3 | building this that I'd like to ultimately fix. The error manifests | ||
4 | itself from the end of LinuxDocTools.pm with the following messages | ||
5 | during do_install: | ||
6 | |||
7 | | - Building txt docs | ||
8 | | Processing file ./guide | ||
9 | | troff: fatal error: can't find macro file s | ||
10 | | fmt_txt::postASP: Empty output file, error when calling groff. Aborting... | ||
11 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
13 | diff -urN linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
14 | --- linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 | ||
15 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-03-04 17:37:24.788923998 -0800 | ||
16 | @@ -40,11 +40,11 @@ | ||
17 | |||
18 | chmod u+x $TMPDIR/linuxdoc | ||
19 | |||
20 | -if [ -n "`which groff`" ]; then | ||
21 | - ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt | ||
22 | - echo "- Building txt docs" >&2 | ||
23 | - $TMPDIR/sgml2txt -b 1 ./guide | ||
24 | -fi | ||
25 | +#if [ -n "`which groff`" ]; then | ||
26 | +# ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt | ||
27 | +# echo "- Building txt docs" >&2 | ||
28 | +# $TMPDIR/sgml2txt -b 1 ./guide | ||
29 | +#fi | ||
30 | |||
31 | if [ -n "`which latex`" ]; then | ||
32 | ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb index ed45ad929f..fbe9219adb 100644 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb +++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb | |||
@@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fbccc46cff2379505ca4e09c7d6ccfe" | |||
6 | 6 | ||
7 | DEPENDS = "openjade-native" | 7 | DEPENDS = "openjade-native" |
8 | 8 | ||
9 | PR = "r1" | 9 | PR = "r2" |
10 | 10 | ||
11 | SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.tar.gz \ | 11 | SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.tar.gz \ |
12 | file://disable_sgml2rtf.patch \ | 12 | file://disable_sgml2rtf.patch \ |
13 | file://disable_txt_doc.patch \ | ||
13 | file://disable_tex_doc.patch \ | 14 | file://disable_tex_doc.patch \ |
14 | file://disable_dvips_doc.patch" | 15 | file://disable_dvips_doc.patch" |
15 | 16 | ||