diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-09-16 15:35:48 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-19 04:52:48 +0100 |
commit | aed52479805b7a3d6721d3aa8e4195d2a41a57d7 (patch) | |
tree | c69882ca0f75e6ecb50d2b6021add91bc193733d /meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch | |
parent | f48f4562b4b4c3185e1fbd57e70117c53b4346a1 (diff) | |
download | poky-aed52479805b7a3d6721d3aa8e4195d2a41a57d7.tar.gz |
texinfo: several changes to build without zlib and ncurses headers on host
Texinfo very cleverly detects cross-compilation and builds host versions
of the texinfo binaries it requires to bootstrap the build, however this
was causing the host to require ncurses and zlib libraries and headers.
Instead, since we require texinfo to be installed on the host, remove this
feature from the texinfo configure.ac (disable-native-tools.patch).
Further, fix texinfo to link with newer binutils (link-zip.patch) and to
generate translations with newer gettext (gettext-macros.patch).
With this patch I am able to build texinfo on Fedora without ncurses-devel
and zlib-devel installed.
This fixes [YOCTO #1483]
(From OE-Core rev: 4b395a9beb6c02f7b23266e7ee2ca3c08a9cbb70)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch')
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch new file mode 100644 index 0000000000..0a2e4917cb --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Bump gettext macro numbers as required by newer gettext built by OE. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Joshua Lock <josh@linux.intel.com> | ||
6 | |||
7 | Index: texinfo-4.13/configure.ac | ||
8 | =================================================================== | ||
9 | --- texinfo-4.13.orig/configure.ac | ||
10 | +++ texinfo-4.13/configure.ac | ||
11 | @@ -193,7 +193,7 @@ AM_CONDITIONAL(INSTALL_WARNINGS, | ||
12 | |||
13 | # i18n support. To update to a new version of gettext, run: | ||
14 | # gettextize -f -c | ||
15 | -AM_GNU_GETTEXT_VERSION([0.17]) | ||
16 | +AM_GNU_GETTEXT_VERSION([0.18]) | ||
17 | AM_GNU_GETTEXT([external]) | ||
18 | |||
19 | # The test suite. | ||
20 | Index: texinfo-4.13/po/Makefile.in.in | ||
21 | =================================================================== | ||
22 | --- texinfo-4.13.orig/po/Makefile.in.in | ||
23 | +++ texinfo-4.13/po/Makefile.in.in | ||
24 | @@ -8,8 +8,8 @@ | ||
25 | # Please note that the actual code of GNU gettext is covered by the GNU | ||
26 | # General Public License and is *not* in the public domain. | ||
27 | # | ||
28 | -# Origin: gettext-0.17 | ||
29 | -GETTEXT_MACRO_VERSION = 0.17 | ||
30 | +# Origin: gettext-0.18 | ||
31 | +GETTEXT_MACRO_VERSION = 0.18 | ||
32 | |||
33 | PACKAGE = @PACKAGE@ | ||
34 | VERSION = @VERSION@ | ||