summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/texinfo/texinfo-4.13a
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-09-16 15:35:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-19 04:52:48 +0100
commitaed52479805b7a3d6721d3aa8e4195d2a41a57d7 (patch)
treec69882ca0f75e6ecb50d2b6021add91bc193733d /meta/recipes-extended/texinfo/texinfo-4.13a
parentf48f4562b4b4c3185e1fbd57e70117c53b4346a1 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch43
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch34
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch16
3 files changed, 93 insertions, 0 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch
new file mode 100644
index 0000000000..ab6f1658aa
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/disable-native-tools.patch
@@ -0,0 +1,43 @@
1We 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
3before cross-compiling. This simplifies the recipe somewhat!
4
5Upstream-Status: Inappropriate oe specific
6
7Signed-off-by: Joshua Lock <josh@linux.intel.com>
8
9Index: texinfo-4.13/configure.ac
10===================================================================
11--- texinfo-4.13.orig/configure.ac
12+++ texinfo-4.13/configure.ac
13@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD
14 # $native_tools is also added to SUBDIRS in the main Makefile.am,
15 # so that make compiles the native tools first.
16 #
17-if test "$cross_compiling" = no; then
18- native_tools=
19-else
20- native_tools=tools
21- test -d "$native_tools" || mkdir "$native_tools"
22- confdir=`(cd "$srcdir";pwd)`
23- # Make sure the secondary configure won't fail with
24- # "error: source directory already configured".
25- rm -f config.status
26- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
27- cd "$native_tools" || exit 1
28- # Run secondary configure in alternate environment or
29- # it gets the wrong CC etc.
30- # env -i gives this build host configure a clean environment;
31- # consequently, we have to re-initialize $PATH.
32- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
33- PATH="$PATH" \
34- tools_only=1 \
35- ${confdir}/configure --build=${build} --host=${build} \
36- --disable-rpath --disable-nls
37- cd .. || exit 1
38- AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
39-fi
40+native_tools=
41 AC_SUBST(native_tools)
42 AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
43
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 @@
1Bump gettext macro numbers as required by newer gettext built by OE.
2
3Upstream-Status: Pending
4
5Signed-off-by: Joshua Lock <josh@linux.intel.com>
6
7Index: 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.
20Index: 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@
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
new file mode 100644
index 0000000000..629d329d7c
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/link-zip.patch
@@ -0,0 +1,16 @@
1install-info uses symbols from zlib so must link against it.
2
3Upstream-Status: Pending
4
5Signed-off-by: Joshua Lock <josh@linux.intel.com>
6
7Index: texinfo-4.13/install-info/Makefile.am
8===================================================================
9--- texinfo-4.13.orig/install-info/Makefile.am
10+++ texinfo-4.13/install-info/Makefile.am
11@@ -28,4 +28,4 @@ AM_CPPFLAGS = \
12 -I$(top_srcdir)/gnulib/lib \
13 -I$(top_builddir)/gnulib/lib \
14 -DLOCALEDIR=\"$(localedir)\"
15-LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
16+LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) -lz