| From e5d8f6d4a7652ea95c8d069ce9333494f2db868c Mon Sep 17 00:00:00 2001 |
| From: Joshua Lock <josh@linux.intel.com> |
| Date: Fri, 16 Sep 2011 15:35:48 -0700 |
| Subject: [PATCH] texinfo: several changes to build without zlib and ncurses |
| |
| 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> |
| |
| --- |
| configure.ac | 24 +----------------------- |
| 1 file changed, 1 insertion(+), 23 deletions(-) |
| |
| diff --git a/configure.ac b/configure.ac |
| index 6fcd3a0..c108df7 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -180,29 +180,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]]) |
| |