summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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
-rw-r--r--meta/recipes-extended/texinfo/texinfo_4.13a.bb24
4 files changed, 105 insertions, 12 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
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
index 450a62306a..9f1c04ace1 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -8,14 +8,18 @@ LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010" 8LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
9PR = "r1" 9PR = "r1"
10 10
11DEPENDS = "zlib" 11DEPENDS = "zlib ncurses texinfo-native"
12DEPENDS_virtclass-native = "zlib-native ncurses-native"
12 13
13SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
14 file://texinfo-4.12-zlib.patch; \ 15 file://texinfo-4.12-zlib.patch \
15 file://texinfo-4.13a-data_types.patch; \ 16 file://texinfo-4.13a-data_types.patch \
16 file://texinfo-4.13a-mosdo-crash.patch; \ 17 file://texinfo-4.13a-mosdo-crash.patch \
17 file://texinfo-4.13a-powerpc.patch; \ 18 file://texinfo-4.13a-powerpc.patch \
18 file://texinfo-4.13a-help-index-segfault.patch;" 19 file://texinfo-4.13a-help-index-segfault.patch \
20 file://disable-native-tools.patch \
21 file://link-zip.patch \
22 file://gettext-macros.patch"
19 23
20SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb" 24SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb"
21SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68" 25SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68"
@@ -25,13 +29,9 @@ tex_texinfo = "texmf/tex/texinfo"
25 29
26inherit gettext autotools 30inherit gettext autotools
27 31
28do_configure() { 32do_compile_prepend() {
29 oe_runconf
30}
31
32do_compile_prepend(){
33 if [ -d tools ];then 33 if [ -d tools ];then
34 make -C tools/gnulib/lib 34 oe_runmake -C tools/gnulib/lib
35 fi 35 fi
36} 36}
37 37