diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-09-30 12:52:25 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-28 16:15:19 +0100 |
commit | 671780de49f93ec1cc28f5ad2a7eebe211918b85 (patch) | |
tree | 42ebe78d73a3f0a0fa49fb83ff1f2e557c9dc505 /meta/recipes-devtools/linuxdoc-tools | |
parent | d95ef2a0aa3116783cd01a905b46fc4920ebae9f (diff) | |
download | poky-671780de49f93ec1cc28f5ad2a7eebe211918b85.tar.gz |
Remove the SGML stack
It is not used for anything, and is something of a pain to maintain.
(From OE-Core rev: 4814d93646f6b86aaffbd3fca1af29c8c577db5b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/linuxdoc-tools')
5 files changed, 0 insertions, 188 deletions
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb deleted file mode 100644 index a5deb2e2d5..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | SUMMARY = "Convert LinuxDoc SGML source into other formats" | ||
2 | HOMEPAGE = "http://packages.debian.org/linuxdoc-tools" | ||
3 | LICENSE = "GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931" | ||
5 | |||
6 | DEPENDS = "groff-native openjade-native" | ||
7 | |||
8 | SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/l/${BPN}/${BPN}_${PV}.orig.tar.gz \ | ||
9 | file://disable_sgml2rtf.patch \ | ||
10 | file://disable_txt_doc.patch \ | ||
11 | file://disable_tex_doc.patch \ | ||
12 | file://disable_dvips_doc.patch" | ||
13 | |||
14 | SRC_URI[md5sum] = "1d13d500918a7a145b0edc2f16f61dd1" | ||
15 | SRC_URI[sha256sum] = "7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101" | ||
16 | |||
17 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/" | ||
18 | inherit autotools-brokensep native | ||
19 | |||
20 | do_configure () { | ||
21 | oe_runconf | ||
22 | } | ||
23 | |||
24 | do_install() { | ||
25 | oe_runmake 'DESTDIR=${D}' 'TMPDIR=${T}' install | ||
26 | } | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch deleted file mode 100644 index 490b367990..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
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 | Upstream-Status: Inappropriate [Other] | ||
6 | Temporary workaround which disables documentation. | ||
7 | |||
8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
9 | |||
10 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
11 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2011-02-25 15:26:41.142917782 -0800 | ||
12 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:27:25.141917472 -0800 | ||
13 | @@ -52,13 +52,13 @@ | ||
14 | # $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
15 | #fi | ||
16 | |||
17 | -if [ -n "`which dvips`" ]; then | ||
18 | - echo " + dvips" >&2 | ||
19 | - dvips -t letter -o ./guide.ps ./guide.dvi | ||
20 | - if [ -n "`which gzip`" -a -f ./guide.ps ]; then | ||
21 | - gzip -fN ./guide.ps | ||
22 | - fi | ||
23 | -fi | ||
24 | +#if [ -n "`which dvips`" ]; then | ||
25 | +# echo " + dvips" >&2 | ||
26 | +# dvips -t letter -o ./guide.ps ./guide.dvi | ||
27 | +# if [ -n "`which gzip`" -a -f ./guide.ps ]; then | ||
28 | +# gzip -fN ./guide.ps | ||
29 | +# fi | ||
30 | +#fi | ||
31 | |||
32 | |||
33 | echo "- Building info docs" >&2 | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch deleted file mode 100644 index 50c8a8f3fe..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 756f20e70a97ee2dea9b32c0955eabfc27f29be1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
3 | Date: Wed, 29 May 2013 16:50:17 +0300 | ||
4 | Subject: [PATCH] The build of sgml2rtf is problematic due to the way it wants | ||
5 | to link to a shared library version of flex. Flex only | ||
6 | ships with a static lib. Rather than diverging from | ||
7 | upstream flex, simply skip building this un-needed utility. | ||
8 | |||
9 | Upstream-Status: Inappropriate [Other] | ||
10 | Workaround which disables a feature. | ||
11 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
13 | Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
14 | --- | ||
15 | Makefile.in | 12 ++++++------ | ||
16 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile.in b/Makefile.in | ||
19 | index 359f14e..fc04020 100644 | ||
20 | --- a/Makefile.in | ||
21 | +++ b/Makefile.in | ||
22 | @@ -40,7 +40,7 @@ perl5lib_ddir = $(DESTDIR)$(perl5libdir) | ||
23 | pkgdata_ddir = $(DESTDIR)$(pkgdatadir) | ||
24 | tex_ddir = $(DESTDIR)$(texdir) | ||
25 | |||
26 | -progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck | ||
27 | +progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2txt sgmlcheck | ||
28 | |||
29 | PROFILE = | ||
30 | INCLUDE = | ||
31 | @@ -71,9 +71,9 @@ endif | ||
32 | ( cd sgmlpre ; \ | ||
33 | $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LEX=flex sgmlpre || exit -1 ) | ||
34 | |||
35 | - @echo "Compiling RTF conversion tools (in rtf-fix/)..." | ||
36 | - ( cd rtf-fix ; \ | ||
37 | - $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 ) | ||
38 | +# @echo "Compiling RTF conversion tools (in rtf-fix/)..." | ||
39 | +# ( cd rtf-fix ; \ | ||
40 | +# $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 ) | ||
41 | |||
42 | @echo "making man pages in genman ..." | ||
43 | if [ ! -d genman ]; then mkdir genman ; fi | ||
44 | @@ -117,7 +117,7 @@ endif | ||
45 | |||
46 | # -- Install auxiliary programs | ||
47 | mkdir -p $(auxbin_ddir) | ||
48 | - for ii in sgmlpre/sgmlpre rtf-fix/rtf2rtf; do \ | ||
49 | + for ii in sgmlpre/sgmlpre; do \ | ||
50 | bn=`basename $$ii`; \ | ||
51 | $(INSTALL_PROGRAM) $$ii $(auxbin_ddir)/$$bn; \ | ||
52 | done | ||
53 | @@ -206,7 +206,7 @@ bin/linuxdoc:: Makefile bin/linuxdoc.in | ||
54 | |||
55 | clean:: | ||
56 | -rm -f *~ bin/*~ bin/linuxdoc | ||
57 | - for d in $(DDIRS) $(MDIRS) rtf-fix; do $(MAKE) -C $$d clean; done | ||
58 | + for d in $(DDIRS) $(MDIRS); do $(MAKE) -C $$d clean; done | ||
59 | (cd sgmlpre ; rm -f sgmlpre.o sgmlpre) | ||
60 | -rm -rf genman/ | ||
61 | |||
62 | -- | ||
63 | 1.7.9.5 | ||
64 | |||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch deleted file mode 100644 index b62895c67d..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
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 | Upstream-Status: Inappropriate [Other] | ||
6 | Temporary workaround which disables documentation. | ||
7 | |||
8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
9 | |||
10 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
11 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 | ||
12 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:23:58.610016114 -0800 | ||
13 | @@ -46,11 +46,11 @@ | ||
14 | $TMPDIR/sgml2txt -b 1 ./guide | ||
15 | fi | ||
16 | |||
17 | -if [ -n "`which latex`" ]; then | ||
18 | - ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||
19 | - echo "- Building latex docs" >&2 | ||
20 | - $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
21 | -fi | ||
22 | +#if [ -n "`which latex`" ]; then | ||
23 | +# ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||
24 | +# echo "- Building latex docs" >&2 | ||
25 | +# $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
26 | +#fi | ||
27 | |||
28 | if [ -n "`which dvips`" ]; then | ||
29 | echo " + dvips" >&2 | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch deleted file mode 100644 index 8d784110db..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
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 | Upstream-Status: Inappropriate [Other] | ||
13 | Temporary workaround which disables documentation. | ||
14 | |||
15 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
16 | |||
17 | diff -urN linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
18 | --- linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 | ||
19 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-03-04 17:37:24.788923998 -0800 | ||
20 | @@ -40,11 +40,11 @@ | ||
21 | |||
22 | chmod u+x $TMPDIR/linuxdoc | ||
23 | |||
24 | -if [ -n "`which groff`" ]; then | ||
25 | - ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt | ||
26 | - echo "- Building txt docs" >&2 | ||
27 | - $TMPDIR/sgml2txt -b 1 ./guide | ||
28 | -fi | ||
29 | +#if [ -n "`which groff`" ]; then | ||
30 | +# ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt | ||
31 | +# echo "- Building txt docs" >&2 | ||
32 | +# $TMPDIR/sgml2txt -b 1 ./guide | ||
33 | +#fi | ||
34 | |||
35 | if [ -n "`which latex`" ]; then | ||
36 | ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||