summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/texinfo/texinfo-4.13a
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-10 12:22:38 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-12 21:50:15 +0000
commit4f0092f7e42cd252573df0ff06ac2cc3573d1237 (patch)
tree88b7b64fad8aa7c70fa0f1eeeb9f16f9446b11c3 /meta/recipes-extended/texinfo/texinfo-4.13a
parentba006ea934088ae4322909e8f45458755300e591 (diff)
downloadpoky-4f0092f7e42cd252573df0ff06ac2cc3573d1237.tar.gz
texinfo: fix compile failure due target makedoc binary being used
Need to have the texinfo-native build and install a host sysroot makedoc binary and then patch the target build to use this binary. This requires that we don't ASSUME_PROVIDED texinfo-native any longer since we need to install this makedoc tool which is not part of the normal distrubtion. [YOCTO #1664] (From OE-Core rev: 9fa98de54a73465f06484ba863eccf1e07cc1e2a) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/texinfo/texinfo-4.13a')
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch
new file mode 100644
index 0000000000..db41f1a47e
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch
@@ -0,0 +1,37 @@
1This patch requires that we also enable building of the
2texinfo-native recipe which will install the makedoc tool
3for the host machine.
4
5This patch simply uses the newly installed makedoc tool from
6sysroot.
7
8Upstream-Status: Inappropriate [OE-Specific]
9
10Signed-off-by: Saul Wold <sgw@linux.intel.com>
11
12Index: texinfo-4.13/info/Makefile.am
13===================================================================
14--- texinfo-4.13.orig/info/Makefile.am 2008-05-22 05:11:33.000000000 -0700
15+++ texinfo-4.13/info/Makefile.am 2011-12-10 12:55:53.604440118 -0800
16@@ -75,7 +75,7 @@
17 # more than once.
18 funs.h: makedoc$(EXEEXT) $(cmd_sources)
19 rm -f $(generated_sources)
20- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
21+ makedoc $(cmd_sources)
22
23 # The following hack is necessary to hint make before the automatic
24 # dependencies are built.
25Index: texinfo-4.13/doc/Makefile.am
26===================================================================
27--- texinfo-4.13.orig/doc/Makefile.am 2008-09-18 11:31:56.000000000 -0700
28+++ texinfo-4.13/doc/Makefile.am 2011-12-10 13:04:09.216457601 -0800
29@@ -19,7 +19,7 @@
30
31 # Use the programs built in our distribution, taking account of possible
32 # cross-compiling.
33-MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
34+MAKEINFO = makeinfo
35
36 # We'd also like to use something like this, but Automake calls
37 # "install-info" directly.