summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/texinfo
diff options
context:
space:
mode:
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.patch28
-rw-r--r--meta/recipes-extended/texinfo/texinfo/link-zip.patch23
-rw-r--r--meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch254
-rw-r--r--meta/recipes-extended/texinfo/texinfo/use_host_makedoc.patch17
-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 @@
1From ee9d23373b488c4a499c561d71e6b6ba7ca1bd31 Mon Sep 17 00:00:00 2001
2From: Joshua Lock <josh@linux.intel.com>
3Date: Fri, 16 Sep 2011 15:35:48 -0700
4Subject: [PATCH 1/3] texinfo: several changes to build without zlib and
5 ncurses
6
1We already DEPEND on the native texinfo being present before building so 7We already DEPEND on the native texinfo being present before building so
2there isn't any need to try and build the required native texinfo binaries 8there isn't any need to try and build the required native texinfo binaries
3before cross-compiling. This simplifies the recipe somewhat! 9before cross-compiling. This simplifies the recipe somewhat!
@@ -5,12 +11,15 @@ before cross-compiling. This simplifies the recipe somewhat!
5Upstream-Status: Inappropriate oe specific 11Upstream-Status: Inappropriate oe specific
6 12
7Signed-off-by: Joshua Lock <josh@linux.intel.com> 13Signed-off-by: Joshua Lock <josh@linux.intel.com>
14---
15 configure.ac | 24 +-----------------------
16 1 file changed, 1 insertion(+), 23 deletions(-)
8 17
9Index: texinfo-4.13/configure.ac 18diff --git a/configure.ac b/configure.ac
10=================================================================== 19index 8094498..5b72fc1 100644
11--- texinfo-4.13.orig/configure.ac 20--- a/configure.ac
12+++ texinfo-4.13/configure.ac 21+++ b/configure.ac
13@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD 22@@ -247,29 +247,7 @@ AC_CANONICAL_BUILD
14 # $native_tools is also added to SUBDIRS in the main Makefile.am, 23 # $native_tools is also added to SUBDIRS in the main Makefile.am,
15 # so that make compiles the native tools first. 24 # so that make compiles the native tools first.
16 # 25 #
@@ -41,3 +50,6 @@ Index: texinfo-4.13/configure.ac
41 AC_SUBST(native_tools) 50 AC_SUBST(native_tools)
42 AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]]) 51 AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
43 52
53--
542.39.2
55
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 @@
1From 63a803ead3656353329a801846a9a3beb7210c46 Mon Sep 17 00:00:00 2001 1From e02be81fa68ddc7f939abd99de4e42759a0d5d8c Mon Sep 17 00:00:00 2001
2From: Edwin Plauchu <edwin.plauchu.camacho@intel.com> 2From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
3Date: Tue, 29 Nov 2016 13:43:24 -0600 3Date: Tue, 29 Nov 2016 13:43:24 -0600
4Subject: [PATCH] dont-depend-on-help2man 4Subject: [PATCH 2/3] dont-depend-on-help2man
5 5
6Upstream-Status: Inappropriate 6Upstream-Status: Inappropriate
7 7
8Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> 8Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
9Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> 9Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
10
11--- 10---
12 doc/Makefile.am | 2 +- 11 doc/Makefile.am | 2 +-
13 man/Makefile.am | 12 ++++++------ 12 man/Makefile.am | 12 ++++++------
14 2 files changed, 7 insertions(+), 7 deletions(-) 13 2 files changed, 7 insertions(+), 7 deletions(-)
15 14
16diff --git a/doc/Makefile.am b/doc/Makefile.am 15diff --git a/doc/Makefile.am b/doc/Makefile.am
17index 732833e..041cb9b 100644 16index e9e6298..f1b9895 100644
18--- a/doc/Makefile.am 17--- a/doc/Makefile.am
19+++ b/doc/Makefile.am 18+++ b/doc/Makefile.am
20@@ -37,7 +37,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \ 19@@ -63,7 +63,7 @@ refcard/txirefcard.pdf refcard/txirefcard-a4.pdf: refcard/txirefcard.tex
21 # Include our texinfo.tex, not Automake's. 20 # Include our texinfo.tex, not Automake's.
22 EXTRA_DIST = epsf.tex texinfo.tex \ 21 EXTRA_DIST = epsf.tex texinfo.tex \
23 fdl.texi \ 22 fdl.texi \
@@ -25,9 +24,9 @@ index 732833e..041cb9b 100644
25+ $(TXI_XLATE) \ 24+ $(TXI_XLATE) \
26 $(refcard_files) \ 25 $(refcard_files) \
27 texinfo-tex-test.texi texinfo-tex-test.WIDOWs \ 26 texinfo-tex-test.texi texinfo-tex-test.WIDOWs \
28 texinfo-ja.tex short-sample-ja.texi 27 texinfo-ja.tex short-sample-ja.texi \
29diff --git a/man/Makefile.am b/man/Makefile.am 28diff --git a/man/Makefile.am b/man/Makefile.am
30index d0cd72c..a19e52a 100644 29index f2c703f..61caeeb 100644
31--- a/man/Makefile.am 30--- a/man/Makefile.am
32+++ b/man/Makefile.am 31+++ b/man/Makefile.am
33@@ -11,27 +11,27 @@ 32@@ -11,27 +11,27 @@
@@ -64,3 +63,6 @@ index d0cd72c..a19e52a 100644
64 63
65 # Maintainers should be able to regenerate. 64 # Maintainers should be able to regenerate.
66 MAINTAINERCLEANFILES = $(man_MANS) 65 MAINTAINERCLEANFILES = $(man_MANS)
66--
672.39.2
68
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 @@
1From 33b85a3928895b812b37dc759c6de711802db45f Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com>
3Date: Mon, 29 Jul 2013 15:02:34 -0700
4Subject: [PATCH 3/3] texinfo: Update to 5.1
5
6Upstream-Status: Inappropriate [cross build specific]
7
8Signed-off-by: Saul Wold <sgw@linux.intel.com>
9---
10 info/Makefile.am | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/info/Makefile.am b/info/Makefile.am
14index f57b341..a019aa7 100644
15--- a/info/Makefile.am
16+++ b/info/Makefile.am
17@@ -77,7 +77,7 @@ cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
18 # more than once.
19 funs.h: makedoc$(EXEEXT) $(cmd_sources)
20 rm -f $(generated_sources)
21- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
22+ makedoc $(cmd_sources)
23
24 # The following hack is necessary to hint make before the automatic
25 # dependencies are built.
26--
272.39.2
28
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 @@
1From c1002138033fcccb2d1abfc41f5c2e46c836f7a0 Mon Sep 17 00:00:00 2001
2From: Joshua Lock <josh@linux.intel.com>
3Date: Mon, 29 Jul 2013 15:02:34 -0700
4Subject: [PATCH] install-info uses symbols from zlib so must link against it.
5
6Upstream-Status: Pending
7
8Signed-off-by: Joshua Lock <josh@linux.intel.com>
9
10---
11 install-info/Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/install-info/Makefile.am b/install-info/Makefile.am
15index 9bcff71..68247f9 100644
16--- a/install-info/Makefile.am
17+++ b/install-info/Makefile.am
18@@ -33,4 +33,4 @@ AM_CPPFLAGS = \
19 -I$(top_srcdir)/gnulib/lib \
20 -I$(top_builddir)/gnulib/lib \
21 -DLOCALEDIR=\"$(localedir)\"
22-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD)
23+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 @@
1From 3d3b66cf398853c666e724c3dbcc37d53a2240d5 Mon Sep 17 00:00:00 2001
2From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
3Date: Tue, 29 Nov 2016 12:27:17 -0600
4Subject: [PATCH] texinfo-4.12-zlib
5
6Upstream-Status: Pending
7
8Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
9Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
10
11---
12 install-info/Makefile.in | 2 +-
13 install-info/install-info.c | 79 ++++++++++++++++++++++---------------
14 2 files changed, 48 insertions(+), 33 deletions(-)
15
16diff --git a/install-info/Makefile.in b/install-info/Makefile.in
17index c924509..746df05 100644
18--- a/install-info/Makefile.in
19+++ b/install-info/Makefile.in
20@@ -218,7 +218,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
21 PROGRAMS = $(bin_PROGRAMS)
22 am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
23 ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
24-ginstall_info_LDADD = $(LDADD)
25+ginstall_info_LDADD = $(LDADD) -lz
26 am__DEPENDENCIES_1 =
27 ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
28 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
29diff --git a/install-info/install-info.c b/install-info/install-info.c
30index 21f4fe3..a7aba82 100644
31--- a/install-info/install-info.c
32+++ b/install-info/install-info.c
33@@ -19,6 +19,7 @@
34 #include <getopt.h>
35 #include <regex.h>
36 #include <argz.h>
37+#include <zlib.h>
38
39 #define TAB_WIDTH 8
40
41@@ -681,15 +682,15 @@ The first time you invoke Info you start off looking at this node.\n\
42
43 Return either stdin reading the file, or a non-stdin pipe reading
44 the output of the compression program. */
45-FILE *
46+void *
47 open_possibly_compressed_file (char *filename,
48 void (*create_callback) (char *),
49- char **opened_filename, char **compression_program)
50+ char **opened_filename, char **compression_program, int *is_pipe)
51 {
52 char *local_opened_filename, *local_compression_program;
53 int nread;
54 char data[13];
55- FILE *f;
56+ gzFile *f;
57
58 /* We let them pass NULL if they don't want this info, but it's easier
59 to always determine it. */
60@@ -697,48 +698,48 @@ open_possibly_compressed_file (char *filename,
61 opened_filename = &local_opened_filename;
62
63 *opened_filename = filename;
64- f = fopen (*opened_filename, FOPEN_RBIN);
65+ f = gzopen (*opened_filename, FOPEN_RBIN);
66 if (!f)
67 {
68 *opened_filename = concat (filename, ".gz", "");
69- f = fopen (*opened_filename, FOPEN_RBIN);
70+ f = gzopen (*opened_filename, FOPEN_RBIN);
71 }
72 if (!f)
73 {
74 free (*opened_filename);
75 *opened_filename = concat (filename, ".xz", "");
76- f = fopen (*opened_filename, FOPEN_RBIN);
77+ f = gzopen (*opened_filename, FOPEN_RBIN);
78 }
79 if (!f)
80 {
81 free (*opened_filename);
82 *opened_filename = concat (filename, ".bz2", "");
83- f = fopen (*opened_filename, FOPEN_RBIN);
84+ f = gzopen (*opened_filename, FOPEN_RBIN);
85 }
86 if (!f)
87 {
88 free (*opened_filename);
89 *opened_filename = concat (filename, ".lz", "");
90- f = fopen (*opened_filename, FOPEN_RBIN);
91+ f = gzopen (*opened_filename, FOPEN_RBIN);
92 }
93 if (!f)
94 {
95 free (*opened_filename);
96 *opened_filename = concat (filename, ".lzma", "");
97- f = fopen (*opened_filename, FOPEN_RBIN);
98+ f = gzopen (*opened_filename, FOPEN_RBIN);
99 }
100 #ifdef __MSDOS__
101 if (!f)
102 {
103 free (*opened_filename);
104 *opened_filename = concat (filename, ".igz", "");
105- f = fopen (*opened_filename, FOPEN_RBIN);
106+ f = gzopen (*opened_filename, FOPEN_RBIN);
107 }
108 if (!f)
109 {
110 free (*opened_filename);
111 *opened_filename = concat (filename, ".inz", "");
112- f = fopen (*opened_filename, FOPEN_RBIN);
113+ f = gzopen (*opened_filename, FOPEN_RBIN);
114 }
115 #endif /* __MSDOS__ */
116 if (!f)
117@@ -754,7 +755,7 @@ open_possibly_compressed_file (char *filename,
118 (*create_callback) (filename);
119
120 /* And try opening it again. */
121- f = fopen (*opened_filename, FOPEN_RBIN);
122+ f = gzopen (*opened_filename, FOPEN_RBIN);
123 if (!f)
124 return 0;
125 }
126@@ -764,26 +765,26 @@ open_possibly_compressed_file (char *filename,
127
128 /* Read first few bytes of file rather than relying on the filename.
129 If the file is shorter than this it can't be usable anyway. */
130- nread = fread (data, sizeof (data), 1, f);
131- if (nread != 1)
132+ nread = gzread (f, data, sizeof (data));
133+ if (nread != sizeof (data))
134 {
135- if (nread == 0)
136+ if (nread >= 0)
137 {
138 /* Try to create the file if its empty. */
139- if (feof (f) && create_callback)
140+ if (gzeof(f) && create_callback)
141 {
142- if (fclose (f) != 0)
143+ if (gzclose(f) != 0)
144 return 0; /* unknown error closing file */
145
146- if (remove (filename) != 0)
147+ if (remove(filename) != 0)
148 return 0; /* unknown error deleting file */
149
150 (*create_callback) (filename);
151- f = fopen (*opened_filename, FOPEN_RBIN);
152+ f = gzopen (*opened_filename, FOPEN_RBIN);
153 if (!f)
154 return 0;
155- nread = fread (data, sizeof (data), 1, f);
156- if (nread == 0)
157+ nread = gzread(f, data, sizeof (data));
158+ if (nread >= 0)
159 return 0;
160 goto determine_file_type; /* success */
161 }
162@@ -854,35 +855,40 @@ determine_file_type:
163 *compression_program = NULL;
164
165 /* Seek back over the magic bytes. */
166- if (fseek (f, 0, 0) < 0)
167+ if (gzseek (f, 0, SEEK_SET) == -1)
168 return 0;
169
170 if (*compression_program)
171 { /* It's compressed, so open a pipe. */
172+ FILE *p;
173 char *command = concat (*compression_program, " -d", "");
174
175- if (fclose (f) < 0)
176+ if (gzclose (f) < 0)
177 return 0;
178- f = freopen (*opened_filename, FOPEN_RBIN, stdin);
179- if (!f)
180+ p = freopen (*opened_filename, FOPEN_RBIN, stdin);
181+ if (!p)
182 return 0;
183- f = popen (command, "r");
184- if (!f)
185+ p = popen (command, "r");
186+ if (!p)
187 {
188 /* Used for error message in calling code. */
189 *opened_filename = command;
190 return 0;
191 }
192+ else
193+ *is_pipe = 1;
194+ return p;
195 }
196 else
197 {
198-#if O_BINARY
199+#if 0 && O_BINARY
200 /* Since this is a text file, and we opened it in binary mode,
201 switch back to text mode. */
202 f = freopen (*opened_filename, "r", f);
203 if (! f)
204 return 0;
205 #endif
206+ *is_pipe = 0;
207 }
208
209 return f;
210@@ -901,7 +907,8 @@ readfile (char *filename, int *sizep,
211 void (*create_callback) (char *), char **opened_filename,
212 char **compression_program)
213 {
214- FILE *f;
215+ void *f;
216+ int pipe_p;
217 int filled = 0;
218 int data_size = 8192;
219 char *data = xmalloc (data_size);
220@@ -909,14 +916,20 @@ readfile (char *filename, int *sizep,
221 /* If they passed the space for the file name to return, use it. */
222 f = open_possibly_compressed_file (filename, create_callback,
223 opened_filename,
224- compression_program);
225+ compression_program,
226+ &pipe_p);
227
228 if (!f)
229 return 0;
230
231 for (;;)
232 {
233- int nread = fread (data + filled, 1, data_size - filled, f);
234+ int nread;
235+
236+ if (pipe_p)
237+ nread = fread (data + filled, 1, data_size - filled, f);
238+ else
239+ nread = gzread (f, data + filled, data_size - filled);
240 if (nread < 0)
241 return 0;
242 if (nread == 0)
243@@ -935,8 +948,10 @@ readfile (char *filename, int *sizep,
244 /* We need to close the stream, since on some systems the pipe created
245 by popen is simulated by a temporary file which only gets removed
246 inside pclose. */
247- if (f != stdin)
248+ if (pipe_p)
249 pclose (f);
250+ else
251+ gzclose (f);
252
253 *sizep = filled;
254 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 @@
1Upstream-Status: Inappropriate [cross build specific]
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Index: texinfo-5.1/info/Makefile.am
6===================================================================
7--- texinfo-5.1.orig/info/Makefile.am
8+++ texinfo-5.1/info/Makefile.am
9@@ -76,7 +76,7 @@ cmd_sources = $(srcdir)/session.c $(srcd
10 # more than once.
11 funs.h: makedoc$(EXEEXT) $(cmd_sources)
12 rm -f $(generated_sources)
13- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
14+ makedoc $(cmd_sources)
15
16 # The following hack is necessary to hint make before the automatic
17 # 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 \
4GNU Project uses the Texinfo file format for most of its documentation." 4GNU Project uses the Texinfo file format for most of its documentation."
5HOMEPAGE = "http://www.gnu.org/software/texinfo/" 5HOMEPAGE = "http://www.gnu.org/software/texinfo/"
6SECTION = "console/utils" 6SECTION = "console/utils"
7LICENSE = "GPLv3+" 7LICENSE = "GPL-3.0-or-later"
8LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" 8LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
9 9
10PROVIDES_append_class-native = " texinfo-replacement-native" 10PROVIDES:append:class-native = " texinfo-replacement-native"
11 11
12def compress_pkg(d): 12def compress_pkg(d):
13 if bb.data.inherits_class('compress_doc', d): 13 if bb.data.inherits_class('compress_doc', d):
@@ -20,24 +20,21 @@ def compress_pkg(d):
20 return "xz" 20 return "xz"
21 return "" 21 return ""
22 22
23RDEPENDS_info += "${@compress_pkg(d)}" 23RDEPENDS:info += "${@compress_pkg(d)}"
24 24
25DEPENDS = "zlib ncurses texinfo-replacement-native" 25DEPENDS = "zlib ncurses texinfo-replacement-native"
26DEPENDS_class-native = "zlib-native ncurses-native" 26DEPENDS:class-native = "zlib-native ncurses-native"
27 27
28TARGET_PATCH = "file://use_host_makedoc.patch" 28TARGET_PATCH = "file://0003-texinfo-Update-to-5.1.patch"
29TARGET_PATCH_class-native = "" 29TARGET_PATCH:class-native = ""
30 30
31SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \ 31SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
32 file://texinfo-4.12-zlib.patch \ 32 file://0001-texinfo-several-changes-to-build-without-zlib-and-nc.patch \
33 file://disable-native-tools.patch \ 33 file://0002-dont-depend-on-help2man.patch \
34 file://link-zip.patch \
35 file://dont-depend-on-help2man.patch \
36 ${TARGET_PATCH} \ 34 ${TARGET_PATCH} \
37 " 35 "
38 36
39SRC_URI[md5sum] = "f0c1782f68ef73738d74bd1e9e30793a" 37SRC_URI[sha256sum] = "dd5710b3a53ac002644677a06145748e260592a35be182dc830ebebb79c5d5a0"
40SRC_URI[sha256sum] = "a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e"
41 38
42tex_texinfo = "texmf/tex/texinfo" 39tex_texinfo = "texmf/tex/texinfo"
43 40
@@ -46,39 +43,41 @@ inherit gettext autotools multilib_script
46MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any" 43MULTILIB_SCRIPTS = "${PN}:${bindir}/texi2any"
47 44
48EXTRA_AUTORECONF += "-I ${S}/gnulib/m4" 45EXTRA_AUTORECONF += "-I ${S}/gnulib/m4"
46CACHED_CONFIGUREVARS += "texinfo_cv_sys_iconv_converts_euc_cn=yes"
49 47
50do_configure_prepend () { 48do_configure:prepend () {
51 # autotools_do_configure updates po/Makefile.in.in, we also need 49 # autotools_do_configure updates po/Makefile.in.in, we also need
52 # update po_document. 50 # update po_document.
53 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/ 51 cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/
54} 52}
55 53
56do_compile_prepend() { 54do_compile:prepend() {
57 if [ -d tools ];then 55 if [ -d tools ];then
58 oe_runmake -C tools/gnulib/lib 56 oe_runmake -C tools/gnulib/lib
59 fi 57 fi
60} 58}
61 59
62do_install_append() { 60do_install:append() {
63 mkdir -p ${D}${datadir}/${tex_texinfo} 61 mkdir -p ${D}${datadir}/${tex_texinfo}
64 install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo} 62 install -p -m644 ${S}/doc/texinfo.tex ${S}/doc/txi-??.tex ${D}${datadir}/${tex_texinfo}
65 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi 63 sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2any ${D}${bindir}/pod2texi
64 sed -i -e 's,${HOSTTOOLS_DIR},,' ${D}${bindir}/texindex
66} 65}
67 66
68do_install_append_class-native() { 67do_install:append:class-native() {
69 install -m 755 info/makedoc ${D}${bindir} 68 install -m 755 info/makedoc ${D}${bindir}
70} 69}
71 70
72PACKAGES += "info info-doc" 71PACKAGES += "info info-doc"
73 72
74FILES_info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info" 73FILES:info = "${bindir}/info ${bindir}/infokey ${bindir}/install-info"
75FILES_info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \ 74FILES:info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \
76 ${mandir}/man1/info.1* ${mandir}/man5/info.5* \ 75 ${mandir}/man1/info.1* ${mandir}/man5/info.5* \
77 ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" 76 ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*"
78 77
79FILES_${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" 78FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo"
80RDEPENDS_${PN} = "perl" 79RDEPENDS:${PN} = "perl"
81FILES_${PN}-doc = "${infodir}/texinfo* \ 80FILES:${PN}-doc = "${infodir}/texi* \
82 ${datadir}/${tex_texinfo} \ 81 ${datadir}/${tex_texinfo} \
83 ${mandir}/man1 ${mandir}/man5" 82 ${mandir}/man1 ${mandir}/man5"
84 83
@@ -86,6 +85,6 @@ FILES_${PN}-doc = "${infodir}/texinfo* \
86# but the code will test for it and if not found use Locale::gettext_pp instead. 85# but the code will test for it and if not found use Locale::gettext_pp instead.
87# However, this causes a file dependency on perl(Locale::gettext_xs) to be 86# However, this causes a file dependency on perl(Locale::gettext_xs) to be
88# generated, which must be satisfied. 87# generated, which must be satisfied.
89RPROVIDES_${PN} += "perl(Locale::gettext_xs)" 88RPROVIDES:${PN} += "perl(Locale::gettext_xs)"
90 89
91BBCLASSEXTEND = "native nativesdk" 90BBCLASSEXTEND = "native nativesdk"