diff options
| author | Andrei Dinu <andrei.adrianx.dinu@intel.com> | 2013-05-30 08:05:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-04 15:53:45 +0100 |
| commit | 376612cbf7fa5c68ae3adb6f4c1b4427e69a1871 (patch) | |
| tree | a31f575871c8042cf0a31eb937a0b0f421240a31 /meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native | |
| parent | 4688c905776b9d995b2510224da269ac85bc8253 (diff) | |
| download | openembedded-core-376612cbf7fa5c68ae3adb6f4c1b4427e69a1871.tar.gz openembedded-core-376612cbf7fa5c68ae3adb6f4c1b4427e69a1871.tar.bz2 openembedded-core-376612cbf7fa5c68ae3adb6f4c1b4427e69a1871.zip | |
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.
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/linuxdoc-tools/linuxdoc-tools-native')
| -rw-r--r-- | meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch | 47 |
1 files changed, 29 insertions, 18 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 @@ -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. +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 -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile.in ---- linuxdoc-tools-0.9.66.orig//Makefile.in 2009-11-09 11:58:25.000000000 -0800 -+++ linuxdoc-tools-0.9.66/Makefile.in 2011-02-24 15:37:46.556937051 -0800 -@@ -40,7 +40,7 @@ +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 - OPTIMIZE = -O - -@@ -64,9 +64,9 @@ - @echo "Compiling preprocessor (in sgmlpre/)..." + PROFILE = + INCLUDE = +@@ -71,9 +71,9 @@ endif ( cd sgmlpre ; \ - $(MAKE) CFLAGS="$(OPTIMIZE)" LEX=flex sgmlpre || exit -1 ) + $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LEX=flex sgmlpre || exit -1 ) + - @echo "Compiling RTF conversion tools (in rtf-fix/)..." - ( cd rtf-fix ; \ -- $(MAKE) CFLAGS="$(OPTIMIZE)" || exit -1 ) +- $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 ) +# @echo "Compiling RTF conversion tools (in rtf-fix/)..." +# ( cd rtf-fix ; \ -+# $(MAKE) CFLAGS="$(OPTIMIZE)" || exit -1 ) ++# $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 ) + @echo "making man pages in genman ..." if [ ! -d genman ]; then mkdir genman ; fi - for ii in man/* ; do \ -@@ -109,7 +109,7 @@ +@@ -117,7 +117,7 @@ endif # -- Install auxiliary programs mkdir -p $(auxbin_ddir) @@ -42,7 +50,7 @@ diff -urN linuxdoc-tools-0.9.66.orig//Makefile.in linuxdoc-tools-0.9.66/Makefile bn=`basename $$ii`; \ $(INSTALL_PROGRAM) $$ii $(auxbin_ddir)/$$bn; \ done -@@ -198,7 +198,7 @@ +@@ -206,7 +206,7 @@ bin/linuxdoc:: Makefile bin/linuxdoc.in clean:: -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 (cd sgmlpre ; rm -f sgmlpre.o sgmlpre) -rm -rf genman/ +-- +1.7.9.5 + |