Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | We already DEPEND on the native texinfo being present before building so |
| 2 | there isn't any need to try and build the required native texinfo binaries |
| 3 | before cross-compiling. This simplifies the recipe somewhat! |
| 4 | |
| 5 | Upstream-Status: Inappropriate oe specific |
| 6 | |
| 7 | Signed-off-by: Joshua Lock <josh@linux.intel.com> |
| 8 | |
| 9 | Index: 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 | |