From 8d33c091784675405fbe1c3e7c3a12cc82b800d1 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Thu, 11 Sep 2014 10:28:28 +0800 Subject: texinfo: integrate texinfo 4.8 It is a GPLv2 package Signed-off-by: Roy Li Signed-off-by: Ross Burton --- .../texinfo/texinfo-4.8/check-locale-h.patch | 28 +++++++++++ .../texinfo-4.8/do-compile-native-tools.patch | 49 +++++++++++++++++++ .../texinfo-4.8/using-native-makeinfo.patch | 24 ++++++++++ meta/recipes-extended/texinfo/texinfo_4.8.bb | 56 ++++++++++++++++++++++ 4 files changed, 157 insertions(+) create mode 100644 meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch create mode 100644 meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch create mode 100644 meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch create mode 100644 meta/recipes-extended/texinfo/texinfo_4.8.bb diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch b/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch new file mode 100644 index 0000000000..4a8cc57a56 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch @@ -0,0 +1,28 @@ +fix the macro check + +Upstream-status: Pending + +configure does not check if locale.h exists, but check setlocale, +if setlocale exist, the locale.h should exist. + +Signed-off-by: Roy Li +--- + lib/system.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/system.h b/lib/system.h +index 946eb3c..c70037b 100644 +--- a/lib/system.h ++++ b/lib/system.h +@@ -42,7 +42,7 @@ extern char *substring (const char *, const char *); + #include + + /* All systems nowadays probably have these functions, but ... */ +-#ifdef HAVE_LOCALE_H ++#ifdef HAVE_SETLOCALE + #include + #endif + #ifndef HAVE_SETLOCALE +-- +1.7.10.4 + diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch b/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch new file mode 100644 index 0000000000..2cc5fbb1fc --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch @@ -0,0 +1,49 @@ +From 458e9450cecf703f55536e609365162719585900 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" +Date: Wed, 10 Sep 2014 17:03:29 +0800 +Subject: [PATCH] do not compile host tools, since we have native + +Upstream-status: Pending + +Signed-off-by: Roy.Li +--- + configure.ac | 23 +---------------------- + 1 file changed, 1 insertion(+), 22 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b46130d..cf58654 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -90,28 +90,7 @@ AC_CANONICAL_BUILD + # $native_tools is also added to SUBDIRS in the main Makefile.am, + # so that make compiles the native tools first. + # +-if test "$cross_compiling" = no; then +- native_tools= +-else +- native_tools=tools +- test -d "$native_tools" || mkdir "$native_tools" +- confdir=`(cd "$srcdir";pwd)` +- # Make sure the secondary configure won't fail with +- # "error: source directory already configured". +- rm -f config.status +- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]]) +- cd "$native_tools" || exit 1 +- # Run secondary configure in alternate environment or +- # it gets the wrong CC etc. env -i gives this build host configure +- # a clean environment. +- env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \ +- PATH="${PATH}" \ +- tools_only=1 \ +- ${confdir}/configure --build=${build} --host=${build} \ +- --disable-rpath --disable-nls +- cd .. || exit 1 +- AC_MSG_NOTICE([[Continuing with main configure (${host}).]]) +-fi ++native_tools= + AC_SUBST(native_tools) + AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) + +-- +1.9.1 + diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch b/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch new file mode 100644 index 0000000000..d9bed6933d --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch @@ -0,0 +1,24 @@ +From 9b0df7d6d3c18cfac82c291d60a5357d1bc8d9d0 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" +Date: Wed, 10 Sep 2014 17:10:03 +0800 +Subject: [PATCH] using native makeinfo + +Upstream-status: Pending + +Signed-off-by: Roy.Li +--- + doc/Makefile.am | 2 +- + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 63df818..b6ceb34 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -19,7 +19,7 @@ man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \ + + # Use the programs built in our distribution, taking account of possible + # cross-compiling. +-MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo ++MAKEINFO = makeinfo + INSTALL_INFO = $(top_builddir)/$(native_tools)/util/install-info + + TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \ diff --git a/meta/recipes-extended/texinfo/texinfo_4.8.bb b/meta/recipes-extended/texinfo/texinfo_4.8.bb new file mode 100644 index 0000000000..6b36b97603 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo_4.8.bb @@ -0,0 +1,56 @@ +SUMMARY = "Documentation system for on-line information and printed output" +DESCRIPTION = "Texinfo is a documentation system that can produce both \ +online information and printed output from a single source file. The \ +GNU Project uses the Texinfo file format for most of its documentation." +HOMEPAGE = "http://www.gnu.org/software/texinfo/" +SECTION = "console/utils" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +PROVIDES_append_class-native = " texinfo-4.8-replacement-native" + +DEPENDS = "zlib ncurses texinfo-4.8-replacement-native" +DEPENDS_class-native = "zlib-native ncurses-native" + +TARGET_PATCH = "file://use_host_makedoc.patch \ + file://using-native-makeinfo.patch \ +" +TARGET_PATCH_class-native = "" + +SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ + file://check-locale-h.patch \ + file://do-compile-native-tools.patch \ + ${TARGET_PATCH} \ + " + +SRC_URI[md5sum] = "4e9a1a591ed236003d0d4b008bf07eef" +SRC_URI[sha256sum] = "1f3cdeebe65fdf510f55d765ab1031b54416aa5bc2635b6a54ef9bcb2367c917" + +S = "${WORKDIR}/${BP}" +tex_texinfo = "texmf/tex/texinfo" + +inherit gettext autotools + +do_install_append() { + mkdir -p ${D}${datadir}/${tex_texinfo} + install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} +} + +do_install_append_class-native() { + install -m 755 info/makedoc ${D}${bindir} + install -m 755 makeinfo/makeinfo ${D}${bindir} +} + +PACKAGES += "info info-doc" + +FILES_info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" +FILES_info-doc = "${infodir}/info.info ${infodir}/dir ${infodir}/info-*.info \ + ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ + ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" + +FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" +FILES_${PN}-doc = "${infodir}/texinfo* \ + ${datadir}/${tex_texinfo} \ + ${mandir}/man1 ${mandir}/man5" + +BBCLASSEXTEND = "native" -- cgit 1.2.3-korg