Skip to content
This repository was archived by the owner on Jan 31, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions recipes/texinfo/texinfo-5.2/disable-native-tools.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
We already DEPEND on the native texinfo being present before building so
there isn't any need to try and build the required native texinfo binaries
before cross-compiling. This simplifies the recipe somewhat!

Upstream-Status: Inappropriate oe specific

Signed-off-by: Joshua Lock <josh@linux.intel.com>

Index: texinfo-4.13/configure.ac
===================================================================
--- texinfo-4.13.orig/configure.ac
+++ texinfo-4.13/configure.ac
@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD
# $native_tools is also added to SUBDIRS in the main Makefile.am,
# so that make compiles the native tools first.
#
-if test "$cross_compiling" = no; then
- native_tools=
-else
- native_tools=tools
- test -d "$native_tools" || mkdir "$native_tools"
- confdir=`(cd "$srcdir";pwd)`
- # Make sure the secondary configure won't fail with
- # "error: source directory already configured".
- rm -f config.status
- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
- cd "$native_tools" || exit 1
- # Run secondary configure in alternate environment or
- # it gets the wrong CC etc.
- # env -i gives this build host configure a clean environment;
- # consequently, we have to re-initialize $PATH.
- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
- PATH="$PATH" \
- tools_only=1 \
- ${confdir}/configure --build=${build} --host=${build} \
- --disable-rpath --disable-nls
- cd .. || exit 1
- AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
-fi
+native_tools=
AC_SUBST(native_tools)
AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])

14 changes: 14 additions & 0 deletions recipes/texinfo/texinfo-5.2/help-discard.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff -urN a/man/Makefile.am b/man/Makefile.am
--- a/man/Makefile.am 2013-03-21 00:05:30.000000000 +0100
+++ b/man/Makefile.am 2015-05-20 23:06:43.635834326 +0200
@@ -63,8 +63,8 @@
&& $(man_rule_0) \
&& echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$$exe_ext \
&& (cd "$$dir" && $(MAKE) $(AM_MAKEFLAGS) $$program$$exe_ext) \
- && echo $(HELP2MAN) --name=\""$$name"\" -I "$$h2m" "$$dir/$$program" -o '$@'\
- && $(HELP2MAN) --name="$$name" -I "$$h2m" "$$dir/$$program" -o '$@'
+ && echo $(HELP2MAN) --no-discard-stderr --name=\""$$name"\" -I "$$h2m" "$$dir/$$program" -o '$@'\
+ && $(HELP2MAN) --no-discard-stderr --name="$$name" -I "$$h2m" "$$dir/$$program" -o '$@'


# Using help2man depends on the package version number.
12 changes: 12 additions & 0 deletions recipes/texinfo/texinfo-5.2/install_makedoc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -urN a/info/Makefile.am b/info/Makefile.am
--- a/info/Makefile.am 2013-04-15 23:39:09.000000000 +0200
+++ b/info/Makefile.am 2015-05-20 19:19:05.506189932 +0200
@@ -63,7 +63,7 @@
# These files are not distributed.
DISTCLEANFILES = $(generated_sources)

-noinst_PROGRAMS = makedoc
+bin_PROGRAMS += makedoc
makedoc_SOURCES = makedoc.c

# Files with Info commands defined that makedoc should read.
12 changes: 12 additions & 0 deletions recipes/texinfo/texinfo-5.2/m4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -urN a/configure.ac b/configure.ac
--- a/configure.ac 2013-09-27 01:04:02.000000000 +0200
+++ b/configure.ac 2015-05-15 13:51:45.614866247 +0200
@@ -21,6 +21,8 @@
AM_INIT_AUTOMAKE([1.14 dist-xz
info-in-builddir parallel-tests readme-alpha tar-ustar])

+m4_include([gnulib/m4/argz.m4])
+
# Where to generate output; srcdir location.
AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
AC_CONFIG_SRCDIR([info/info.c])
17 changes: 17 additions & 0 deletions recipes/texinfo/texinfo-5.2/use_host_makedoc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Upstream-Status: Inappropriate [cross build specific]

Signed-off-by: Saul Wold <sgw@linux.intel.com>

Index: texinfo-5.1/info/Makefile.am
===================================================================
--- texinfo-5.1.orig/info/Makefile.am
+++ texinfo-5.1/info/Makefile.am
@@ -76,7 +76,7 @@ cmd_sources = $(srcdir)/session.c $(srcd
# more than once.
funs.h: makedoc$(EXEEXT) $(cmd_sources)
rm -f $(generated_sources)
- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
+ makedoc $(cmd_sources)

# The following hack is necessary to hint make before the automatic
# dependencies are built.
15 changes: 15 additions & 0 deletions recipes/texinfo/texinfo.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# -*- mode:python; -*-
RECIPE_TYPES = "machine native"

inherit autotools-autoreconf gettext

DEPENDS += "native:help2man ${DEPENDS_NOT_NATIVE}"

DEPENDS_NOT_NATIVE = "native:texinfo"
DEPENDS_NOT_NATIVE:native = ""

require conf/fetch/gnu.conf
SRC_URI += "${GNU_MIRROR}/${PN}/${PN}-${PV}.tar.xz"

PROVIDES_${PN} += "makeinfo install-info texi2dvi texi2pdf pod2texi infokey texindex texi2any info pdftexi2dvi"

8 changes: 8 additions & 0 deletions recipes/texinfo/texinfo_5.2.oe
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
require ${PN}.inc

SRC_URI += "file://m4.patch"
SRC_URI += "file://disable-native-tools.patch"
SRC_URI += "file://help-discard.patch"
SRC_URI += "${SRC_URI_NATIVE}"
SRC_URI_NATIVE = "file://use_host_makedoc.patch"
SRC_URI_NATIVE:native = "file://install_makedoc.patch"
1 change: 1 addition & 0 deletions recipes/texinfo/texinfo_5.2.oe.sig
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fbbc35c5857d11d1164c8445c78b66ad6d472072 texinfo-5.2.tar.xz