diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-12-27 10:10:48 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 11:12:29 +0000 |
commit | f85cf4b351e877b2679c85832d45ac398ab29b51 (patch) | |
tree | 2a90147757ee06f7e5ccaa279ccef4993ab17b79 /meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch | |
parent | 144a48e34d17fd8736a482bae4ee69efc37b8a1f (diff) | |
download | openembedded-core-f85cf4b351e877b2679c85832d45ac398ab29b51.tar.gz |
texinfo: Update to 5.2
Removed a backported patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch')
-rw-r--r-- | meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch new file mode 100644 index 0000000000..ab6f1658aa --- /dev/null +++ b/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch @@ -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]]) + |