summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAndrei Dinu <andrei.adrianx.dinu@intel.com>2013-05-30 08:05:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 16:48:22 +0100
commit31073bc1e63e0754e35e09209aa86a7414ccf9de (patch)
treeb2b8e79002e945c573def426d0aef046c54c4769 /meta/recipes-devtools
parentbccc74c406322d544fc942d99d739f75ba3fdf1a (diff)
downloadpoky-31073bc1e63e0754e35e09209aa86a7414ccf9de.tar.gz
linuxdoc-tools-native : upgrade to 0.9.69
upgrade from 0.9.66 -> 0.9.69 - COPYING file contains now more detailed information. - reworked a patch because it didn't apply. (From OE-Core rev: 376612cbf7fa5c68ae3adb6f4c1b4427e69a1871) Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch47
-rw-r--r--meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb (renamed from meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.66.bb)10
2 files changed, 34 insertions, 23 deletions
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
index 424410d524..50c8a8f3fe 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
@@ -1,39 +1,47 @@
1The build of sgml2rtf is problematic due to the way it wants to 1From 756f20e70a97ee2dea9b32c0955eabfc27f29be1 Mon Sep 17 00:00:00 2001
2link to a shared library version of flex. Flex only ships with a 2From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
3static lib. Rather than diverging from upstream flex, simply skip 3Date: Wed, 29 May 2013 16:50:17 +0300
4building this un-needed utility. 4Subject: [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.
5 8
6Upstream-Status: Inappropriate [Other] 9Upstream-Status: Inappropriate [Other]
7Workaround which disables a feature. 10Workaround which disables a feature.
8 11
9Signed-off-by: Scott Garman <scott.a.garman@intel.com> 12Signed-off-by: Scott Garman <scott.a.garman@intel.com>
13Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
14---
15 Makefile.in | 12 ++++++------
16 1 file changed, 6 insertions(+), 6 deletions(-)
10 17
11diff -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile.in 18diff --git a/Makefile.in b/Makefile.in
12--- linuxdoc-tools-0.9.66.orig//Makefile.in 2009-11-09 11:58:25.000000000 -0800 19index 359f14e..fc04020 100644
13+++ linuxdoc-tools-0.9.66/Makefile.in 2011-02-24 15:37:46.556937051 -0800 20--- a/Makefile.in
14@@ -40,7 +40,7 @@ 21+++ b/Makefile.in
22@@ -40,7 +40,7 @@ perl5lib_ddir = $(DESTDIR)$(perl5libdir)
15 pkgdata_ddir = $(DESTDIR)$(pkgdatadir) 23 pkgdata_ddir = $(DESTDIR)$(pkgdatadir)
16 tex_ddir = $(DESTDIR)$(texdir) 24 tex_ddir = $(DESTDIR)$(texdir)
17 25
18-progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck 26-progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck
19+progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2txt sgmlcheck 27+progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2txt sgmlcheck
20 28
21 OPTIMIZE = -O 29 PROFILE =
22 30 INCLUDE =
23@@ -64,9 +64,9 @@ 31@@ -71,9 +71,9 @@ endif
24 @echo "Compiling preprocessor (in sgmlpre/)..."
25 ( cd sgmlpre ; \ 32 ( cd sgmlpre ; \
26 $(MAKE) CFLAGS="$(OPTIMIZE)" LEX=flex sgmlpre || exit -1 ) 33 $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LEX=flex sgmlpre || exit -1 )
34
27- @echo "Compiling RTF conversion tools (in rtf-fix/)..." 35- @echo "Compiling RTF conversion tools (in rtf-fix/)..."
28- ( cd rtf-fix ; \ 36- ( cd rtf-fix ; \
29- $(MAKE) CFLAGS="$(OPTIMIZE)" || exit -1 ) 37- $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 )
30+# @echo "Compiling RTF conversion tools (in rtf-fix/)..." 38+# @echo "Compiling RTF conversion tools (in rtf-fix/)..."
31+# ( cd rtf-fix ; \ 39+# ( cd rtf-fix ; \
32+# $(MAKE) CFLAGS="$(OPTIMIZE)" || exit -1 ) 40+# $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 )
41
33 @echo "making man pages in genman ..." 42 @echo "making man pages in genman ..."
34 if [ ! -d genman ]; then mkdir genman ; fi 43 if [ ! -d genman ]; then mkdir genman ; fi
35 for ii in man/* ; do \ 44@@ -117,7 +117,7 @@ endif
36@@ -109,7 +109,7 @@
37 45
38 # -- Install auxiliary programs 46 # -- Install auxiliary programs
39 mkdir -p $(auxbin_ddir) 47 mkdir -p $(auxbin_ddir)
@@ -42,7 +50,7 @@ diff -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile
42 bn=`basename $$ii`; \ 50 bn=`basename $$ii`; \
43 $(INSTALL_PROGRAM) $$ii $(auxbin_ddir)/$$bn; \ 51 $(INSTALL_PROGRAM) $$ii $(auxbin_ddir)/$$bn; \
44 done 52 done
45@@ -198,7 +198,7 @@ 53@@ -206,7 +206,7 @@ bin/linuxdoc:: Makefile bin/linuxdoc.in
46 54
47 clean:: 55 clean::
48 -rm -f *~ bin/*~ bin/linuxdoc 56 -rm -f *~ bin/*~ bin/linuxdoc
@@ -51,3 +59,6 @@ diff -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile
51 (cd sgmlpre ; rm -f sgmlpre.o sgmlpre) 59 (cd sgmlpre ; rm -f sgmlpre.o sgmlpre)
52 -rm -rf genman/ 60 -rm -rf genman/
53 61
62--
631.7.9.5
64
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.69.bb
index 5c9dd6f5da..b744ccd368 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.69.bb
@@ -2,20 +2,20 @@ SUMMARY = "Convert LinuxDoc SGML source into other formats"
2DESCRIPTION = "Convert LinuxDoc SGML source into other formats" 2DESCRIPTION = "Convert LinuxDoc SGML source into other formats"
3HOMEPAGE = "http://packages.debian.org/linuxdoc-tools" 3HOMEPAGE = "http://packages.debian.org/linuxdoc-tools"
4LICENSE = "GPLv3+" 4LICENSE = "GPLv3+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=5fbccc46cff2379505ca4e09c7d6ccfe" 5LIC_FILES_CHKSUM = "file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931"
6 6
7DEPENDS = "groff-native openjade-native" 7DEPENDS = "groff-native openjade-native"
8 8
9PR = "r3" 9PR = "r0"
10 10
11SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.tar.gz \ 11SRC_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.gz \
12 file://disable_sgml2rtf.patch \ 12 file://disable_sgml2rtf.patch \
13 file://disable_txt_doc.patch \ 13 file://disable_txt_doc.patch \
14 file://disable_tex_doc.patch \ 14 file://disable_tex_doc.patch \
15 file://disable_dvips_doc.patch" 15 file://disable_dvips_doc.patch"
16 16
17SRC_URI[md5sum] = "f214e79b0dd084689cd04f18722bd563" 17SRC_URI[md5sum] = "1d13d500918a7a145b0edc2f16f61dd1"
18SRC_URI[sha256sum] = "128cabb52ef8fb2f370ee488ea92bf4d8e49859200c7c8cae807abfe860a62ec" 18SRC_URI[sha256sum] = "7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101"
19 19
20FILESPATH = "${FILE_DIRNAME}/linuxdoc-tools-native/" 20FILESPATH = "${FILE_DIRNAME}/linuxdoc-tools-native/"
21 21