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

diff --git a/configure b/configure
index 1a3493cf774b641a961889b44629136c19343016..af896e1a16fa1e1a0f89b6b0c8dd61ef6f4b8222 100755 (executable)
--- a/configure
+++ b/configure
@@ -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.

diff --git a/third-party/jansson/configure.m4 b/third-party/jansson/configure.m4
index 9b10cad2ce4508380bbe3af12dc7a7d7cd1d1f98..4570de195a5d211deb5fdffdb55383a4bc222ed0 100644 (file)
--- a/third-party/jansson/configure.m4
+++ b/third-party/jansson/configure.m4
@@ -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

diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4
index 85417100e60e67ce78ab72db52a86b4c1649da37..9175a1177eb56a06b8737c6fc1065a56e18a29aa 100644 (file)
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -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.