summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch37
-rw-r--r--meta/recipes-extended/texinfo/texinfo_4.13a.bb11
2 files changed, 46 insertions, 2 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.
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
index 9f1c04ace1..f205d4e04d 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -6,11 +6,14 @@ HOMEPAGE = "http://www.gnu.org/software/texinfo/"
6SECTION = "console/utils" 6SECTION = "console/utils"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010" 8LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
9PR = "r1" 9PR = "r2"
10 10
11DEPENDS = "zlib ncurses texinfo-native" 11DEPENDS = "zlib ncurses texinfo-native"
12DEPENDS_virtclass-native = "zlib-native ncurses-native" 12DEPENDS_virtclass-native = "zlib-native ncurses-native"
13 13
14TARGET_PATCH = "file://use_host_makedoc.patch"
15TARGET_PATCH_virtclass-native = ""
16
14SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \ 17SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
15 file://texinfo-4.12-zlib.patch \ 18 file://texinfo-4.12-zlib.patch \
16 file://texinfo-4.13a-data_types.patch \ 19 file://texinfo-4.13a-data_types.patch \
@@ -19,7 +22,8 @@ SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
19 file://texinfo-4.13a-help-index-segfault.patch \ 22 file://texinfo-4.13a-help-index-segfault.patch \
20 file://disable-native-tools.patch \ 23 file://disable-native-tools.patch \
21 file://link-zip.patch \ 24 file://link-zip.patch \
22 file://gettext-macros.patch" 25 file://gettext-macros.patch \
26 ${TARGET_PATCH}"
23 27
24SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb" 28SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb"
25SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68" 29SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68"
@@ -39,6 +43,9 @@ do_install_append() {
39 mkdir -p ${D}${datadir}/${tex_texinfo} 43 mkdir -p ${D}${datadir}/${tex_texinfo}
40 install -p -m644 doc/texinfo.tex doc/txi-??.tex ${D}${datadir}/${tex_texinfo} 44 install -p -m644 doc/texinfo.tex doc/txi-??.tex ${D}${datadir}/${tex_texinfo}
41} 45}
46do_install_append_virtclass-native() {
47 install -m 755 info/makedoc ${D}${bindir}
48}
42 49
43PACKAGES += "info info-doc" 50PACKAGES += "info info-doc"
44 51