summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/texinfo/texinfo-4.8
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/texinfo/texinfo-4.8')
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch28
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch49
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch24
3 files changed, 0 insertions, 101 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch b/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch
deleted file mode 100644
index f4d66600a1..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.8/check-locale-h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1fix the macro check
2
3Upstream-Status: Pending
4
5configure does not check if locale.h exists, but check setlocale,
6if setlocale exist, the locale.h should exist.
7
8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9---
10 lib/system.h | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/lib/system.h b/lib/system.h
14index 946eb3c..c70037b 100644
15--- a/lib/system.h
16+++ b/lib/system.h
17@@ -42,7 +42,7 @@ extern char *substring (const char *, const char *);
18 #include <ctype.h>
19
20 /* All systems nowadays probably have these functions, but ... */
21-#ifdef HAVE_LOCALE_H
22+#ifdef HAVE_SETLOCALE
23 #include <locale.h>
24 #endif
25 #ifndef HAVE_SETLOCALE
26--
271.7.10.4
28
diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch b/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch
deleted file mode 100644
index 81ebe26cf6..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.8/do-compile-native-tools.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 458e9450cecf703f55536e609365162719585900 Mon Sep 17 00:00:00 2001
2From: "Roy.Li" <rongqing.li@windriver.com>
3Date: Wed, 10 Sep 2014 17:03:29 +0800
4Subject: [PATCH] do not compile host tools, since we have native
5
6Upstream-Status: Pending
7
8Signed-off-by: Roy.Li <rongqing.li@windriver.com>
9---
10 configure.ac | 23 +----------------------
11 1 file changed, 1 insertion(+), 22 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index b46130d..cf58654 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -90,28 +90,7 @@ AC_CANONICAL_BUILD
18 # $native_tools is also added to SUBDIRS in the main Makefile.am,
19 # so that make compiles the native tools first.
20 #
21-if test "$cross_compiling" = no; then
22- native_tools=
23-else
24- native_tools=tools
25- test -d "$native_tools" || mkdir "$native_tools"
26- confdir=`(cd "$srcdir";pwd)`
27- # Make sure the secondary configure won't fail with
28- # "error: source directory already configured".
29- rm -f config.status
30- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
31- cd "$native_tools" || exit 1
32- # Run secondary configure in alternate environment or
33- # it gets the wrong CC etc. env -i gives this build host configure
34- # a clean environment.
35- env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \
36- PATH="${PATH}" \
37- tools_only=1 \
38- ${confdir}/configure --build=${build} --host=${build} \
39- --disable-rpath --disable-nls
40- cd .. || exit 1
41- AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
42-fi
43+native_tools=
44 AC_SUBST(native_tools)
45 AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
46
47--
481.9.1
49
diff --git a/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch b/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch
deleted file mode 100644
index 2297051ddb..0000000000
--- a/meta/recipes-extended/texinfo/texinfo-4.8/using-native-makeinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 9b0df7d6d3c18cfac82c291d60a5357d1bc8d9d0 Mon Sep 17 00:00:00 2001
2From: "Roy.Li" <rongqing.li@windriver.com>
3Date: Wed, 10 Sep 2014 17:10:03 +0800
4Subject: [PATCH] using native makeinfo
5
6Upstream-Status: Pending
7
8Signed-off-by: Roy.Li <rongqing.li@windriver.com>
9---
10 doc/Makefile.am | 2 +-
11
12diff --git a/doc/Makefile.am b/doc/Makefile.am
13index 63df818..b6ceb34 100644
14--- a/doc/Makefile.am
15+++ b/doc/Makefile.am
16@@ -19,7 +19,7 @@ man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \
17
18 # Use the programs built in our distribution, taking account of possible
19 # cross-compiling.
20-MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
21+MAKEINFO = makeinfo
22 INSTALL_INFO = $(top_builddir)/$(native_tools)/util/install-info
23
24 TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \