[Asterisk-code-review] build : Fix cross-compilation errors (asterisk[13])

[Jean Aunis - Prescom]

Jean Aunis - Prescom has uploaded this change for review. ( https://gerrit.asterisk.org/10918


Change subject: build : Fix cross-compilation errors
......................................................................

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
---
M configure
M third-party/jansson/configure.m4
M third-party/pjproject/configure.m4
3 files changed, 8 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/18/10918/1

diff --git a/configure b/configure
index 1a3493c..af896e1 100755
--- a/configure
+++ b/configure
@@ -9252,10 +9252,10 @@
 
 	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 @@
 
 	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 9b10cad..4570de1 100644
--- a/third-party/jansson/configure.m4
+++ b/third-party/jansson/configure.m4
@@ -49,10 +49,10 @@
 	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 8541710..9175a11 100644
--- a/third-party/pjproject/configure.m4
+++ b/third-party/pjproject/configure.m4
@@ -49,10 +49,10 @@
 	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.

-- 
To view, visit https://gerrit.asterisk.org/10918
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0a76e52a87d4ab82b7d4c72d27d8759ca931880
Gerrit-Change-Number: 10918
Gerrit-PatchSet: 1
Gerrit-Owner: Jean Aunis - Prescom <jean.aunis at prescom.fr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190124/0ded26ef/attachment.html>