diff options
Diffstat (limited to 'meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch')
-rw-r--r-- | meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch | 64 |
1 files changed, 0 insertions, 64 deletions
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 | |||