mirror of
https://git.yoctoproject.org/poky
synced 2026-06-16 16:53:48 +02:00
linuxdoc-tools: remove usage of FILESPATH
Fixes [YOCTO #4497] Usage of FILESPATH is discouraged, since it can make recipes harder to bbappend. (From OE-Core rev: 6ffd023085f8918b7967e8b7de674f0411220382) Signed-off-by: Petter Mabäcker <petter@technux.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Petter Mabäcker
committed by
Richard Purdie
Richard Purdie
parent
d45466c3cd
commit
c8a6583aad
@@ -0,0 +1,33 @@
|
||||
Disable building documentation which requires the dvips utility.
|
||||
This patch should be dropped once we include a native version of
|
||||
dvips.
|
||||
|
||||
Upstream-Status: Inappropriate [Other]
|
||||
Temporary workaround which disables documentation.
|
||||
|
||||
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
|
||||
@@ -0,0 +1,64 @@
|
||||
From 756f20e70a97ee2dea9b32c0955eabfc27f29be1 Mon Sep 17 00:00:00 2001
|
||||
From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
|
||||
Date: Wed, 29 May 2013 16:50:17 +0300
|
||||
Subject: [PATCH] The build of sgml2rtf is problematic due to the way it wants
|
||||
to link to a shared library version of flex. Flex only
|
||||
ships with a static lib. Rather than diverging from
|
||||
upstream flex, simply skip building this un-needed utility.
|
||||
|
||||
Upstream-Status: Inappropriate [Other]
|
||||
Workaround which disables a feature.
|
||||
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
|
||||
---
|
||||
Makefile.in | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 359f14e..fc04020 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -40,7 +40,7 @@ perl5lib_ddir = $(DESTDIR)$(perl5libdir)
|
||||
pkgdata_ddir = $(DESTDIR)$(pkgdatadir)
|
||||
tex_ddir = $(DESTDIR)$(texdir)
|
||||
|
||||
-progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck
|
||||
+progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2txt sgmlcheck
|
||||
|
||||
PROFILE =
|
||||
INCLUDE =
|
||||
@@ -71,9 +71,9 @@ endif
|
||||
( cd sgmlpre ; \
|
||||
$(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LEX=flex sgmlpre || exit -1 )
|
||||
|
||||
- @echo "Compiling RTF conversion tools (in rtf-fix/)..."
|
||||
- ( cd rtf-fix ; \
|
||||
- $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 )
|
||||
+# @echo "Compiling RTF conversion tools (in rtf-fix/)..."
|
||||
+# ( cd rtf-fix ; \
|
||||
+# $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 )
|
||||
|
||||
@echo "making man pages in genman ..."
|
||||
if [ ! -d genman ]; then mkdir genman ; fi
|
||||
@@ -117,7 +117,7 @@ endif
|
||||
|
||||
# -- Install auxiliary programs
|
||||
mkdir -p $(auxbin_ddir)
|
||||
- for ii in sgmlpre/sgmlpre rtf-fix/rtf2rtf; do \
|
||||
+ for ii in sgmlpre/sgmlpre; do \
|
||||
bn=`basename $$ii`; \
|
||||
$(INSTALL_PROGRAM) $$ii $(auxbin_ddir)/$$bn; \
|
||||
done
|
||||
@@ -206,7 +206,7 @@ bin/linuxdoc:: Makefile bin/linuxdoc.in
|
||||
|
||||
clean::
|
||||
-rm -f *~ bin/*~ bin/linuxdoc
|
||||
- for d in $(DDIRS) $(MDIRS) rtf-fix; do $(MAKE) -C $$d clean; done
|
||||
+ for d in $(DDIRS) $(MDIRS); do $(MAKE) -C $$d clean; done
|
||||
(cd sgmlpre ; rm -f sgmlpre.o sgmlpre)
|
||||
-rm -rf genman/
|
||||
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
Disable building documentation which requires the latex utility.
|
||||
This patch should be dropped once we include a native version of
|
||||
latex.
|
||||
|
||||
Upstream-Status: Inappropriate [Other]
|
||||
Temporary workaround which disables documentation.
|
||||
|
||||
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
|
||||
@@ -0,0 +1,36 @@
|
||||
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...
|
||||
|
||||
Upstream-Status: Inappropriate [Other]
|
||||
Temporary workaround which disables documentation.
|
||||
|
||||
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-03-04 17:37:24.788923998 -0800
|
||||
@@ -40,11 +40,11 @@
|
||||
|
||||
chmod u+x $TMPDIR/linuxdoc
|
||||
|
||||
-if [ -n "`which groff`" ]; then
|
||||
- ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt
|
||||
- echo "- Building txt docs" >&2
|
||||
- $TMPDIR/sgml2txt -b 1 ./guide
|
||||
-fi
|
||||
+#if [ -n "`which groff`" ]; then
|
||||
+# ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt
|
||||
+# echo "- Building txt docs" >&2
|
||||
+# $TMPDIR/sgml2txt -b 1 ./guide
|
||||
+#fi
|
||||
|
||||
if [ -n "`which latex`" ]; then
|
||||
ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex
|
||||
Reference in New Issue
Block a user