build : Fix cross-compilation errors

Bundled pjproject and jansson must be configured with the host and build
parameters provided to the configure script.

ASTERISK-28250

Change-Id: If0a76e52a87d4ab82b7d4c72d27d8759ca931880
13.25
Jean Aunis 7 years ago
parent 9514829403
commit e456600575

8
configure vendored

@ -9252,10 +9252,10 @@ $as_echo "configuring" >&6; }
this_host=$(./config.sub $(./config.guess))
if test "$build" != "$this_host" ; then
JANSSON_CONFIGURE_OPTS+=" --build=$build"
JANSSON_CONFIGURE_OPTS+=" --build=$build_alias"
fi
if test "$host" != "$this_host" ; then
JANSSON_CONFIGURE_OPTS+=" --host=$host"
JANSSON_CONFIGURE_OPTS+=" --host=$host_alias"
fi
export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP
@ -9373,10 +9373,10 @@ $as_echo "configuring" >&6; }
this_host=$(./config.sub $(./config.guess))
if test "$build" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --build=$build"
PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"
fi
if test "$host" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --host=$host"
PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"
fi
# This was a copy of the autoconf generated code from the root ./configure.
# Hopefully, when you read this, the code is still the same.

@ -49,10 +49,10 @@ AC_DEFUN([_JANSSON_CONFIGURE],
AC_ARG_VAR([JANSSON_CONFIGURE_OPTS],[Additional configure options to pass to bundled jansson])
this_host=$(./config.sub $(./config.guess))
if test "$build" != "$this_host" ; then
JANSSON_CONFIGURE_OPTS+=" --build=$build"
JANSSON_CONFIGURE_OPTS+=" --build=$build_alias"
fi
if test "$host" != "$this_host" ; then
JANSSON_CONFIGURE_OPTS+=" --host=$host"
JANSSON_CONFIGURE_OPTS+=" --host=$host_alias"
fi
export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP

@ -49,10 +49,10 @@ AC_DEFUN([_PJPROJECT_CONFIGURE],
AC_ARG_VAR([PJPROJECT_CONFIGURE_OPTS],[Additional configure options to pass to bundled pjproject])
this_host=$(./config.sub $(./config.guess))
if test "$build" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --build=$build"
PJPROJECT_CONFIGURE_OPTS+=" --build=$build_alias"
fi
if test "$host" != "$this_host" ; then
PJPROJECT_CONFIGURE_OPTS+=" --host=$host"
PJPROJECT_CONFIGURE_OPTS+=" --host=$host_alias"
fi
# This was a copy of the autoconf generated code from the root ./configure.
# Hopefully, when you read this, the code is still the same.

Loading…
Cancel
Save