summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/texinfo/texinfo-4.13a
diff options
context:
space:
mode:
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/link-zip.patch16
2 files changed, 59 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/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