diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-12-10 12:22:38 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-12 21:50:15 +0000 |
commit | 4f0092f7e42cd252573df0ff06ac2cc3573d1237 (patch) | |
tree | 88b7b64fad8aa7c70fa0f1eeeb9f16f9446b11c3 /meta/recipes-extended/texinfo/texinfo_4.13a.bb | |
parent | ba006ea934088ae4322909e8f45458755300e591 (diff) | |
download | poky-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.bb')
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo_4.13a.bb | 11 |
1 files changed, 9 insertions, 2 deletions
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/" | |||
6 | SECTION = "console/utils" | 6 | SECTION = "console/utils" |
7 | LICENSE = "GPLv3+" | 7 | LICENSE = "GPLv3+" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010" |
9 | PR = "r1" | 9 | PR = "r2" |
10 | 10 | ||
11 | DEPENDS = "zlib ncurses texinfo-native" | 11 | DEPENDS = "zlib ncurses texinfo-native" |
12 | DEPENDS_virtclass-native = "zlib-native ncurses-native" | 12 | DEPENDS_virtclass-native = "zlib-native ncurses-native" |
13 | 13 | ||
14 | TARGET_PATCH = "file://use_host_makedoc.patch" | ||
15 | TARGET_PATCH_virtclass-native = "" | ||
16 | |||
14 | SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \ | 17 | SRC_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 | ||
24 | SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb" | 28 | SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb" |
25 | SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68" | 29 | SRC_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 | } |
46 | do_install_append_virtclass-native() { | ||
47 | install -m 755 info/makedoc ${D}${bindir} | ||
48 | } | ||
42 | 49 | ||
43 | PACKAGES += "info info-doc" | 50 | PACKAGES += "info info-doc" |
44 | 51 | ||