diff options
Diffstat (limited to 'meta/recipes-extended/texinfo')
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch (renamed from meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch) | 22 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch (renamed from meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch) | 16 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/link-zip.patch | 23 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch | 254 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch | 17 | ||||
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo_7.1.bb (renamed from meta/recipes-extended/texinfo/texinfo_6.7.bb) | 43 |
7 files changed, 75 insertions, 328 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch index ab6f1658aa..b43a115b23 100644 --- a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch +++ b/meta/recipes-extended/texinfo/texinfo/0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch @@ -1,3 +1,9 @@ +From ee9d23373b488c4a499c561d71e6b6ba7ca1bd31 Mon Sep 17 00:00:00 2001 +From: Joshua Lock <josh@linux.intel.com> +Date: Fri, 16 Sep 2011 15:35:48 -0700 +Subject: [PATCH 1/3] texinfo: several changes to build without zlib and + ncurses + 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! @@ -5,12 +11,15 @@ before cross-compiling. This simplifies the recipe somewhat! Upstream-Status: Inappropriate oe specific Signed-off-by: Joshua Lock <josh@linux.intel.com> +--- + configure.ac | 24 +----------------------- + 1 file changed, 1 insertion(+), 23 deletions(-) -Index: texinfo-4.13/configure.ac -=================================================================== ---- texinfo-4.13.orig/configure.ac -+++ texinfo-4.13/configure.ac -@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD +diff --git a/configure.ac b/configure.ac +index 8094498..5b72fc1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -247,29 +247,7 @@ AC_CANONICAL_BUILD # $native_tools is also added to SUBDIRS in the main Makefile.am, # so that make compiles the native tools first. # @@ -41,3 +50,6 @@ Index: texinfo-4.13/configure.ac AC_SUBST(native_tools) AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) +-- +2.39.2 + diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch index 0d6bbafadd..f3b6827d58 100644 --- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch +++ b/meta/recipes-extended/texinfo/texinfo/0002-dont-depend-on-help2man.patch @@ -1,23 +1,22 @@ -From 63a803ead3656353329a801846a9a3beb7210c46 Mon Sep 17 00:00:00 2001 +From e02be81fa68ddc7f939abd99de4e42759a0d5d8c 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 +Subject: [PATCH 2/3] 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 732833e..041cb9b 100644 +index e9e6298..f1b9895 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am -@@ -37,7 +37,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ +@@ -63,7 +63,7 @@ refcard/txirefcard.pdf refcard/txirefcard-a4.pdf: refcard/txirefcard.tex # Include our texinfo.tex, not Automake's. EXTRA_DIST = epsf.tex texinfo.tex \ fdl.texi \ @@ -25,9 +24,9 @@ index 732833e..041cb9b 100644 + $(TXI_XLATE) \ $(refcard_files) \ texinfo-tex-test.texi texinfo-tex-test.WIDOWs \ - texinfo-ja.tex short-sample-ja.texi + texinfo-ja.tex short-sample-ja.texi \ diff --git a/man/Makefile.am b/man/Makefile.am -index d0cd72c..a19e52a 100644 +index f2c703f..61caeeb 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -11,27 +11,27 @@ @@ -64,3 +63,6 @@ index d0cd72c..a19e52a 100644 # Maintainers should be able to regenerate. MAINTAINERCLEANFILES = $(man_MANS) +-- +2.39.2 + diff --git a/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch b/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch new file mode 100644 index 0000000000..f99f8b87d5 --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/0003-texinfo-Update-to-5.1.patch @@ -0,0 +1,28 @@ +From 33b85a3928895b812b37dc759c6de711802db45f Mon Sep 17 00:00:00 2001 +From: Saul Wold <sgw@linux.intel.com> +Date: Mon, 29 Jul 2013 15:02:34 -0700 +Subject: [PATCH 3/3] texinfo: Update to 5.1 + +Upstream-Status: Inappropriate [cross build specific] + +Signed-off-by: Saul Wold <sgw@linux.intel.com> +--- + info/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/info/Makefile.am b/info/Makefile.am +index f57b341..a019aa7 100644 +--- a/info/Makefile.am ++++ b/info/Makefile.am +@@ -77,7 +77,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \ + # 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. +-- +2.39.2 + diff --git a/meta/recipes-extended/texinfo/texinfo/link-zip.patch b/meta/recipes-extended/texinfo/texinfo/link-zip.patch deleted file mode 100644 index 15c030c0c6..0000000000 --- a/meta/recipes-extended/texinfo/texinfo/link-zip.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c1002138033fcccb2d1abfc41f5c2e46c836f7a0 Mon Sep 17 00:00:00 2001 -From: Joshua Lock <josh@linux.intel.com> -Date: Mon, 29 Jul 2013 15:02:34 -0700 -Subject: [PATCH] install-info uses symbols from zlib so must link against it. - -Upstream-Status: Pending - -Signed-off-by: Joshua Lock <josh@linux.intel.com> - ---- - install-info/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/install-info/Makefile.am b/install-info/Makefile.am -index 9bcff71..68247f9 100644 ---- a/install-info/Makefile.am -+++ b/install-info/Makefile.am -@@ -33,4 +33,4 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/gnulib/lib \ - -I$(top_builddir)/gnulib/lib \ - -DLOCALEDIR=\"$(localedir)\" --LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) -+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) -lz diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch deleted file mode 100644 index f72097e639..0000000000 --- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch +++ /dev/null @@ -1,254 +0,0 @@ -From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 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 | 2 +- - install-info/install-info.c | 79 ++++++++++++++++++++++--------------- - 2 files changed, 48 insertions(+), 33 deletions(-) - -diff --git a/install-info/Makefile.in b/install-info/Makefile.in -index c924509..746df05 100644 ---- a/install-info/Makefile.in -+++ b/install-info/Makefile.in -@@ -218,7 +218,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) $(am__DEPENDENCIES_1) -diff --git a/install-info/install-info.c b/install-info/install-info.c -index 21f4fe3..a7aba82 100644 ---- a/install-info/install-info.c -+++ b/install-info/install-info.c -@@ -19,6 +19,7 @@ - #include <getopt.h> - #include <regex.h> - #include <argz.h> -+#include <zlib.h> - - #define TAB_WIDTH 8 - -@@ -681,15 +682,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. */ -@@ -697,48 +698,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) -@@ -754,7 +755,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; - } -@@ -764,26 +765,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 */ - } -@@ -854,35 +855,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; -@@ -901,7 +907,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); -@@ -909,14 +916,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) -@@ -935,8 +948,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; diff --git a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch deleted file mode 100644 index 5b7f32d9a9..0000000000 --- a/meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch +++ /dev/null @@ -1,17 +0,0 @@ -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/meta/recipes-extended/texinfo/texinfo_6.7.bb b/meta/recipes-extended/texinfo/texinfo_7.1.bb index d421b79a0b..65d8252fb9 100644 --- a/meta/recipes-extended/texinfo/texinfo_6.7.bb +++ b/meta/recipes-extended/texinfo/texinfo_7.1.bb @@ -4,10 +4,10 @@ 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+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -PROVIDES_append_class-native = " texinfo-replacement-native" +PROVIDES:append:class-native = " texinfo-replacement-native" def compress_pkg(d): if bb.data.inherits_class('compress_doc', d): @@ -20,24 +20,21 @@ def compress_pkg(d): return "xz" return "" -RDEPENDS_info += "${@compress_pkg(d)}" +RDEPENDS:info += "${@compress_pkg(d)}" DEPENDS = "zlib ncurses texinfo-replacement-native" -DEPENDS_class-native = "zlib-native ncurses-native" +DEPENDS:class-native = "zlib-native ncurses-native" -TARGET_PATCH = "file://use_host_makedoc.patch" -TARGET_PATCH_class-native = "" +TARGET_PATCH = "file://0003-texinfo-Update-to-5.1.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-texinfo-several-changes-to-build-without-zlib-and-nc.patch \ + file://0002-dont-depend-on-help2man.patch \ ${TARGET_PATCH} \ " -SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" -SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e" +SRC_URI[sha256sum] = "dd5710b3a53ac002644677a06145748e260592a35be182dc830ebebb79c5d5a0" tex_texinfo = "texmf/tex/texinfo" @@ -46,39 +43,41 @@ inherit gettext autotools multilib_script MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" +CACHED_CONFIGUREVARS += "texinfo_cv_sys_iconv_converts_euc_cn=yes" -do_configure_prepend () { +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() { +do_compile:prepend() { if [ -d tools ];then oe_runmake -C tools/gnulib/lib fi } -do_install_append() { +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 + sed -i -e 's,${HOSTTOOLS_DIR},,' ${D}${bindir}/texindex } -do_install_append_class-native() { +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* \ +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* \ +FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" +RDEPENDS:${PN} = "perl" +FILES:${PN}-doc = "${infodir}/texi* \ ${datadir}/${tex_texinfo} \ ${mandir}/man1 ${mandir}/man5" @@ -86,6 +85,6 @@ FILES_${PN}-doc = "${infodir}/texinfo* \ # 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)" +RPROVIDES:${PN} += "perl(Locale::gettext_xs)" BBCLASSEXTEND = "native nativesdk" |