diff options
author | Scott Garman <scott.a.garman@intel.com> | 2011-02-25 15:39:16 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-02-25 16:39:08 -0800 |
commit | 16b8f9693655a1964014fc4afba861c4d59ea93f (patch) | |
tree | 441aad34b9722a6a2ec7abfe866ef9befa368553 /meta/recipes-devtools/linuxdoc-tools | |
parent | 7943338d1fea2b9e49b02f1c9f68b4a47188b883 (diff) | |
download | poky-16b8f9693655a1964014fc4afba861c4d59ea93f.tar.gz |
linuxdoc-tools-native: disable doc builds requriing latex and dvips
This fixes the following errors during do_install on hosts which have
latex and/or dvips installed:
fmt_latex2e::postASP: LaTeX first run problem. Aborting ...
dvips: ! DVI file can't be opened.
Our goal is to have native versions of these tools eventually. Until
then, disable these parts of the documentation install process.
This fixes [BUGID #774].
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-devtools/linuxdoc-tools')
3 files changed, 58 insertions, 2 deletions
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch new file mode 100644 index 0000000000..7ac1a1fa93 --- /dev/null +++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | Disable building documentation which requires the dvips utility. | ||
2 | This patch should be dropped once we include a native version of | ||
3 | dvips. | ||
4 | |||
5 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
6 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
7 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2011-02-25 15:26:41.142917782 -0800 | ||
8 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:27:25.141917472 -0800 | ||
9 | @@ -52,13 +52,13 @@ | ||
10 | # $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
11 | #fi | ||
12 | |||
13 | -if [ -n "`which dvips`" ]; then | ||
14 | - echo " + dvips" >&2 | ||
15 | - dvips -t letter -o ./guide.ps ./guide.dvi | ||
16 | - if [ -n "`which gzip`" -a -f ./guide.ps ]; then | ||
17 | - gzip -fN ./guide.ps | ||
18 | - fi | ||
19 | -fi | ||
20 | +#if [ -n "`which dvips`" ]; then | ||
21 | +# echo " + dvips" >&2 | ||
22 | +# dvips -t letter -o ./guide.ps ./guide.dvi | ||
23 | +# if [ -n "`which gzip`" -a -f ./guide.ps ]; then | ||
24 | +# gzip -fN ./guide.ps | ||
25 | +# fi | ||
26 | +#fi | ||
27 | |||
28 | |||
29 | echo "- Building info docs" >&2 | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch new file mode 100644 index 0000000000..f47693be00 --- /dev/null +++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Disable building documentation which requires the latex utility. | ||
2 | This patch should be dropped once we include a native version of | ||
3 | latex. | ||
4 | |||
5 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
6 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
7 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 | ||
8 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:23:58.610016114 -0800 | ||
9 | @@ -46,11 +46,11 @@ | ||
10 | $TMPDIR/sgml2txt -b 1 ./guide | ||
11 | fi | ||
12 | |||
13 | -if [ -n "`which latex`" ]; then | ||
14 | - ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||
15 | - echo "- Building latex docs" >&2 | ||
16 | - $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
17 | -fi | ||
18 | +#if [ -n "`which latex`" ]; then | ||
19 | +# ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||
20 | +# echo "- Building latex docs" >&2 | ||
21 | +# $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
22 | +#fi | ||
23 | |||
24 | if [ -n "`which dvips`" ]; then | ||
25 | echo " + dvips" >&2 | ||
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 f3cd19571b..ed45ad929f 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,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5fbccc46cff2379505ca4e09c7d6ccfe" | |||
6 | 6 | ||
7 | DEPENDS = "openjade-native" | 7 | DEPENDS = "openjade-native" |
8 | 8 | ||
9 | PR = "r0" | 9 | PR = "r1" |
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_tex_doc.patch \ | ||
14 | file://disable_dvips_doc.patch" | ||
13 | 15 | ||
14 | SRC_URI[md5sum] = "f214e79b0dd084689cd04f18722bd563" | 16 | SRC_URI[md5sum] = "f214e79b0dd084689cd04f18722bd563" |
15 | SRC_URI[sha256sum] = "128cabb52ef8fb2f370ee488ea92bf4d8e49859200c7c8cae807abfe860a62ec" | 17 | SRC_URI[sha256sum] = "128cabb52ef8fb2f370ee488ea92bf4d8e49859200c7c8cae807abfe860a62ec" |