diff options
| author |   Scott Garman <scott.a.garman@intel.com> | 2011-02-25 15:39:16 -0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2011-03-01 11:46:47 +0000 |
| commit | 5da6b66c7e6720e3c7f95af2cd106152ece9241b (patch) | |
| tree | d6bae10fe80a7420e96e46393f82f31d35d58990 | |
| parent | 68d548cbae729eaea8ce1403dc95ff63c4a7375c (diff) | |
| download | openembedded-core-contrib-5da6b66c7e6720e3c7f95af2cd106152ece9241b.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>
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 @@ +Disable building documentation which requires the dvips utility. +This patch should be dropped once we include a native version of +dvips. + +Signed-off-by: Scott Garman <scott.a.garman@intel.com> +diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh +--- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2011-02-25 15:26:41.142917782 -0800 ++++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:27:25.141917472 -0800 +@@ -52,13 +52,13 @@ + # $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide + #fi + +-if [ -n "`which dvips`" ]; then +- echo " + dvips" >&2 +- dvips -t letter -o ./guide.ps ./guide.dvi +- if [ -n "`which gzip`" -a -f ./guide.ps ]; then +- gzip -fN ./guide.ps +- fi +-fi ++#if [ -n "`which dvips`" ]; then ++# echo " + dvips" >&2 ++# dvips -t letter -o ./guide.ps ./guide.dvi ++# if [ -n "`which gzip`" -a -f ./guide.ps ]; then ++# gzip -fN ./guide.ps ++# fi ++#fi + + + 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 @@ +Disable building documentation which requires the latex utility. +This patch should be dropped once we include a native version of +latex. + +Signed-off-by: Scott Garman <scott.a.garman@intel.com> +diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh +--- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 ++++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:23:58.610016114 -0800 +@@ -46,11 +46,11 @@ + $TMPDIR/sgml2txt -b 1 ./guide + fi + +-if [ -n "`which latex`" ]; then +- ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex +- echo "- Building latex docs" >&2 +- $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide +-fi ++#if [ -n "`which latex`" ]; then ++# ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex ++# echo "- Building latex docs" >&2 ++# $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide ++#fi + + if [ -n "`which dvips`" ]; then + 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" DEPENDS = "openjade-native" -PR = "r0" +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.tar.gz \ - file://disable_sgml2rtf.patch" + file://disable_sgml2rtf.patch \ + file://disable_tex_doc.patch \ + file://disable_dvips_doc.patch" SRC_URI[md5sum] = "f214e79b0dd084689cd04f18722bd563" SRC_URI[sha256sum] = "128cabb52ef8fb2f370ee488ea92bf4d8e49859200c7c8cae807abfe860a62ec" |