Repository: thrift Updated Branches: refs/heads/master f2319457f -> 4d3f937ab
THRIFT-2127: Autoconf scripting does not properly account for cross-compile Client: build Patch: Frank Earl Updated patch to add lt_sysroot to help with cross-compiling Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4d3f937a Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4d3f937a Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4d3f937a Branch: refs/heads/master Commit: 4d3f937abd9df3b51ae0f76825fc403958ee6805 Parents: f231945 Author: jfarrell <[email protected]> Authored: Wed Oct 8 23:35:05 2014 -0400 Committer: jfarrell <[email protected]> Committed: Wed Oct 8 23:35:05 2014 -0400 ---------------------------------------------------------------------- aclocal/ax_boost_base.m4 | 4 ++-- aclocal/ax_lib_event.m4 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/4d3f937a/aclocal/ax_boost_base.m4 ---------------------------------------------------------------------- diff --git a/aclocal/ax_boost_base.m4 b/aclocal/ax_boost_base.m4 index 8e6ee9a..b496020 100644 --- a/aclocal/ax_boost_base.m4 +++ b/aclocal/ax_boost_base.m4 @@ -121,7 +121,7 @@ if test "x$want_boost" = "xyes"; then fi done elif test "$cross_compiling" != yes; then - for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do + for ac_boost_path_tmp in $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local ; do if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then for libsubdir in $libsubdirs ; do if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi @@ -185,7 +185,7 @@ if test "x$want_boost" = "xyes"; then fi else if test "$cross_compiling" != yes; then - for ac_boost_path in /usr /usr/local /opt /opt/local ; do + for ac_boost_path in $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local ; do if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` http://git-wip-us.apache.org/repos/asf/thrift/blob/4d3f937a/aclocal/ax_lib_event.m4 ---------------------------------------------------------------------- diff --git a/aclocal/ax_lib_event.m4 b/aclocal/ax_lib_event.m4 index 7d2f98a..cf6c4c2 100644 --- a/aclocal/ax_lib_event.m4 +++ b/aclocal/ax_lib_event.m4 @@ -165,7 +165,7 @@ AC_DEFUN([AX_LIB_EVENT], if test -n "$ax_libevent_path"; then AX_LIB_EVENT_DO_CHECK else - for ax_libevent_path in "" /usr /usr/local /opt /opt/local /opt/libevent "$LIBEVENT_ROOT" ; do + for ax_libevent_path in "" $lt_sysroot/usr $lt_sysroot/usr/local $lt_sysroot/opt $lt_sysroot/opt/local $lt_sysroot/opt/libevent "$LIBEVENT_ROOT" ; do AX_LIB_EVENT_DO_CHECK if test "$success" = "yes"; then break;
