diff options
Diffstat (limited to 'poky/meta/recipes-extended/texinfo')
7 files changed, 517 insertions, 0 deletions
diff --git a/poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch b/poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 000000000..c7338aa47 --- /dev/null +++ b/poky/meta/recipes-extended/texinfo/texinfo/0001-Unset-need_charset_alias-when-building-for-musl.patch @@ -0,0 +1,30 @@ +From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 13 Apr 2015 17:02:13 -0700 +Subject: [PATCH] Unset need_charset_alias when building for musl + +localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 +which actually shoudl be fixed in gnulib and then all downstream +projects will get it eventually. For now we apply the fix to +coreutils + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + lib/gnulib.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: texinfo-5.2/gnulib/lib/Makefile.am +=================================================================== +--- texinfo-5.2.orig/gnulib/lib/Makefile.am ++++ texinfo-5.2/gnulib/lib/Makefile.am +@@ -378,7 +378,7 @@ install-exec-localcharset: all-local + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ diff --git a/poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch new file mode 100644 index 000000000..ab6f1658a --- /dev/null +++ b/poky/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch @@ -0,0 +1,43 @@ +We already DEPEND on the native texinfo being present before building so +there isn't any need to try and build the required native texinfo binaries +before cross-compiling. This simplifies the recipe somewhat! + +Upstream-Status: Inappropriate oe specific + +Signed-off-by: Joshua Lock <josh@linux.intel.com> + +Index: texinfo-4.13/configure.ac +=================================================================== +--- texinfo-4.13.orig/configure.ac ++++ texinfo-4.13/configure.ac +@@ -100,29 +100,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; +- # consequently, we have to re-initialize $PATH. +- 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]]) + diff --git a/poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch new file mode 100644 index 000000000..f4184399c --- /dev/null +++ b/poky/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch @@ -0,0 +1,65 @@ +From e89b1c57d76f5cf5acbb0d0187374f7a77bce1e2 Mon Sep 17 00:00:00 2001 +From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> +Date: Tue, 29 Nov 2016 13:43:24 -0600 +Subject: [PATCH] dont-depend-on-help2man + +Upstream-Status: Inappropriate + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> +--- + doc/Makefile.am | 2 +- + man/Makefile.am | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 39db834..1bb2a4f +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -38,7 +38,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ + # Include our texinfo.tex, not Automake's. + EXTRA_DIST = epsf.tex texinfo.tex \ + fdl.texi \ +- $(man_MANS) $(TXI_XLATE) \ ++ $(TXI_XLATE) \ + $(refcard_files) texinfo-tex-test.texi \ + texinfo-ja.tex short-sample-ja.texi + +diff --git a/man/Makefile.am b/man/Makefile.am +index 6bfcb3d..a820c96 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -13,24 +13,24 @@ + # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + # These are generated using help2man. +-man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 ++#man_MANS = install-info.1 makeinfo.1 texindex.1 texi2dvi.1 + + # These require the build in info/, thus can't do if we failed to find a + # terminal library. + if HAVE_TERMLIBS +-man_MANS += info.1 ++#man_MANS += info.1 + endif + + # These are hand-written. +-man_MANS += info.5 texinfo.5 ++#man_MANS += info.5 texinfo.5 + + # This is generated by pod2man, but let's just run it by hand. +-man_MANS += pod2texi.1 ++#man_MANS += pod2texi.1 + + # These are just .so's to the common program. +-man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 ++#man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1 + +-EXTRA_DIST = $(man_MANS) ginfo.h2m ++EXTRA_DIST = ginfo.h2m + + # Maintainers should be able to regenerate. + MAINTAINERCLEANFILES = $(man_MANS) +-- +2.9.3 + diff --git a/poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch b/poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch new file mode 100644 index 000000000..0b6e9fd7e --- /dev/null +++ b/poky/meta/recipes-extended/texinfo/texinfo/link-zip.patch @@ -0,0 +1,16 @@ +install-info uses symbols from zlib so must link against it. + +Upstream-Status: Pending + +Signed-off-by: Joshua Lock <josh@linux.intel.com> + +Index: texinfo-5.1/install-info/Makefile.am +=================================================================== +--- texinfo-5.1.orig/install-info/Makefile.am ++++ texinfo-5.1/install-info/Makefile.am +@@ -34,4 +34,4 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/gnulib/lib \ + -I$(top_builddir)/gnulib/lib \ + -DLOCALEDIR=\"$(localedir)\" +-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) ++LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz diff --git a/poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch new file mode 100644 index 000000000..f25352c63 --- /dev/null +++ b/poky/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch @@ -0,0 +1,256 @@ +From fe4f00459601efe0cfa75d92749a32237800a530 Mon Sep 17 00:00:00 2001 +From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> +Date: Tue, 29 Nov 2016 12:27:17 -0600 +Subject: [PATCH] texinfo-4.12-zlib + +Upstream-Status: Pending + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> +--- + install-info/Makefile.in | 12 ++----- + install-info/install-info.c | 79 +++++++++++++++++++++++++++------------------ + 2 files changed, 49 insertions(+), 42 deletions(-) + +diff --git a/install-info/Makefile.in b/install-info/Makefile.in +index 837d020..ba96579 100644 +--- a/install-info/Makefile.in ++++ b/install-info/Makefile.in +@@ -216,7 +208,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) + am_ginstall_info_OBJECTS = install-info.$(OBJEXT) + ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) +-ginstall_info_LDADD = $(LDADD) ++ginstall_info_LDADD = $(LDADD) -lz + am__DEPENDENCIES_1 = + ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \ + $(am__DEPENDENCIES_1) +diff --git a/install-info/install-info.c b/install-info/install-info.c +index e58189c..8617787 100644 +--- a/install-info/install-info.c ++++ b/install-info/install-info.c +@@ -22,6 +22,7 @@ + #include <getopt.h> + #include <regex.h> + #include <argz.h> ++#include <zlib.h> + + #define TAB_WIDTH 8 + +@@ -684,15 +685,15 @@ The first time you invoke Info you start off looking at this node.\n\ + + Return either stdin reading the file, or a non-stdin pipe reading + the output of the compression program. */ +-FILE * ++void * + open_possibly_compressed_file (char *filename, + void (*create_callback) (char *), +- char **opened_filename, char **compression_program) ++ char **opened_filename, char **compression_program, int *is_pipe) + { + char *local_opened_filename, *local_compression_program; + int nread; + char data[13]; +- FILE *f; ++ gzFile *f; + + /* We let them pass NULL if they don't want this info, but it's easier + to always determine it. */ +@@ -700,48 +701,48 @@ open_possibly_compressed_file (char *filename, + opened_filename = &local_opened_filename; + + *opened_filename = filename; +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + { + *opened_filename = concat (filename, ".gz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".xz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".bz2", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".lz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".lzma", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + #ifdef __MSDOS__ + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".igz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + if (!f) + { + free (*opened_filename); + *opened_filename = concat (filename, ".inz", ""); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + } + #endif /* __MSDOS__ */ + if (!f) +@@ -757,7 +758,7 @@ open_possibly_compressed_file (char *filename, + (*create_callback) (filename); + + /* And try opening it again. */ +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + return 0; + } +@@ -767,26 +768,26 @@ open_possibly_compressed_file (char *filename, + + /* Read first few bytes of file rather than relying on the filename. + If the file is shorter than this it can't be usable anyway. */ +- nread = fread (data, sizeof (data), 1, f); +- if (nread != 1) ++ nread = gzread (f, data, sizeof (data)); ++ if (nread != sizeof (data)) + { +- if (nread == 0) ++ if (nread >= 0) + { + /* Try to create the file if its empty. */ +- if (feof (f) && create_callback) ++ if (gzeof(f) && create_callback) + { +- if (fclose (f) != 0) ++ if (gzclose(f) != 0) + return 0; /* unknown error closing file */ + +- if (remove (filename) != 0) ++ if (remove(filename) != 0) + return 0; /* unknown error deleting file */ + + (*create_callback) (filename); +- f = fopen (*opened_filename, FOPEN_RBIN); ++ f = gzopen (*opened_filename, FOPEN_RBIN); + if (!f) + return 0; +- nread = fread (data, sizeof (data), 1, f); +- if (nread == 0) ++ nread = gzread(f, data, sizeof (data)); ++ if (nread >= 0) + return 0; + goto determine_file_type; /* success */ + } +@@ -857,35 +858,40 @@ determine_file_type: + *compression_program = NULL; + + /* Seek back over the magic bytes. */ +- if (fseek (f, 0, 0) < 0) ++ if (gzseek (f, 0, SEEK_SET) == -1) + return 0; + + if (*compression_program) + { /* It's compressed, so open a pipe. */ ++ FILE *p; + char *command = concat (*compression_program, " -d", ""); + +- if (fclose (f) < 0) ++ if (gzclose (f) < 0) + return 0; +- f = freopen (*opened_filename, FOPEN_RBIN, stdin); +- if (!f) ++ p = freopen (*opened_filename, FOPEN_RBIN, stdin); ++ if (!p) + return 0; +- f = popen (command, "r"); +- if (!f) ++ p = popen (command, "r"); ++ if (!p) + { + /* Used for error message in calling code. */ + *opened_filename = command; + return 0; + } ++ else ++ *is_pipe = 1; ++ return p; + } + else + { +-#if O_BINARY ++#if 0 && O_BINARY + /* Since this is a text file, and we opened it in binary mode, + switch back to text mode. */ + f = freopen (*opened_filename, "r", f); + if (! f) + return 0; + #endif ++ *is_pipe = 0; + } + + return f; +@@ -904,7 +910,8 @@ readfile (char *filename, int *sizep, + void (*create_callback) (char *), char **opened_filename, + char **compression_program) + { +- FILE *f; ++ void *f; ++ int pipe_p; + int filled = 0; + int data_size = 8192; + char *data = xmalloc (data_size); +@@ -912,14 +919,20 @@ readfile (char *filename, int *sizep, + /* If they passed the space for the file name to return, use it. */ + f = open_possibly_compressed_file (filename, create_callback, + opened_filename, +- compression_program); ++ compression_program, ++ &pipe_p); + + if (!f) + return 0; + + for (;;) + { +- int nread = fread (data + filled, 1, data_size - filled, f); ++ int nread; ++ ++ if (pipe_p) ++ nread = fread (data + filled, 1, data_size - filled, f); ++ else ++ nread = gzread (f, data + filled, data_size - filled); + if (nread < 0) + return 0; + if (nread == 0) +@@ -938,8 +951,10 @@ readfile (char *filename, int *sizep, + /* We need to close the stream, since on some systems the pipe created + by popen is simulated by a temporary file which only gets removed + inside pclose. */ +- if (f != stdin) ++ if (pipe_p) + pclose (f); ++ else ++ gzclose (f); + + *sizep = filled; + return data; +-- +2.9.3 + diff --git a/poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch b/poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch new file mode 100644 index 000000000..5b7f32d9a --- /dev/null +++ b/poky/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch @@ -0,0 +1,17 @@ +Upstream-Status: Inappropriate [cross build specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +Index: texinfo-5.1/info/Makefile.am +=================================================================== +--- texinfo-5.1.orig/info/Makefile.am ++++ texinfo-5.1/info/Makefile.am +@@ -76,7 +76,7 @@ cmd_sources = $(srcdir)/session.c $(srcd + # more than once. + funs.h: makedoc$(EXEEXT) $(cmd_sources) + rm -f $(generated_sources) +- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources) ++ makedoc $(cmd_sources) + + # The following hack is necessary to hint make before the automatic + # dependencies are built. diff --git a/poky/meta/recipes-extended/texinfo/texinfo_6.5.bb b/poky/meta/recipes-extended/texinfo/texinfo_6.5.bb new file mode 100644 index 000000000..f966457f8 --- /dev/null +++ b/poky/meta/recipes-extended/texinfo/texinfo_6.5.bb @@ -0,0 +1,90 @@ +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 = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PROVIDES_append_class-native = " texinfo-replacement-native" + +def compress_pkg(d): + if bb.data.inherits_class('compress_doc', d): + compress = d.getVar("DOC_COMPRESS") + if compress == "gz": + return "gzip" + elif compress == "bz2": + return "bzip2" + elif compress == "xz": + return "xz" + return "" + +RDEPENDS_info += "${@compress_pkg(d)}" + +DEPENDS = "zlib ncurses texinfo-replacement-native" +DEPENDS_class-native = "zlib-native ncurses-native" + +TARGET_PATCH = "file://use_host_makedoc.patch" +TARGET_PATCH_class-native = "" + +SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ + file://texinfo-4.12-zlib.patch \ + file://disable-native-tools.patch \ + file://link-zip.patch \ + file://dont-depend-on-help2man.patch \ + file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + ${TARGET_PATCH} \ + " + +SRC_URI[md5sum] = "94e8f7149876793030e5518dd8d6e956" +SRC_URI[sha256sum] = "d34272e4042c46186ddcd66bd5d980c0ca14ff734444686ccf8131f6ec8b1427" + +tex_texinfo = "texmf/tex/texinfo" + +inherit gettext autotools + +EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" + +do_configure_prepend () { + # autotools_do_configure updates po/Makefile.in.in, we also need + # update po_document. + cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/ +} + +do_compile_prepend() { + if [ -d tools ];then + oe_runmake -C tools/gnulib/lib + fi +} + +do_install_append() { + mkdir -p ${D}${datadir}/${tex_texinfo} + install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} + sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi +} + +do_install_append_class-native() { + install -m 755 info/makedoc ${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" +RDEPENDS_${PN} = "perl" +FILES_${PN}-doc = "${infodir}/texinfo* \ + ${datadir}/${tex_texinfo} \ + ${mandir}/man1 ${mandir}/man5" + +# Lie about providing the Locale::gettext_xs module. It is not actually built, +# but the code will test for it and if not found use Locale::gettext_pp instead. +# However, this causes a file dependency on perl(Locale::gettext_xs) to be +# generated, which must be satisfied. +RPROVIDES_${PN} += "perl(Locale::gettext_xs)" + +BBCLASSEXTEND = "native nativesdk" |
