[Scummvm-git-logs] scummvm-tools master -> f93cacd0537598513ac1cd08ccbc62dc28d12654

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
f93cacd053 CONFIGURE: Add an environemt variable that discards the --host option


Commit: f93cacd0537598513ac1cd08ccbc62dc28d12654
    https://github.com/scummvm/scummvm-tools/commit/f93cacd0537598513ac1cd08ccbc62dc28d12654
Author: Christian Krause (chkr at fedoraproject.org)
Date: 2020-12-06T18:11:29+01:00

Commit Message:
CONFIGURE: Add an environemt variable that discards the --host option

Backported (and modified) commit scummvm/scummvm at 8c28a2da7832f to
be used in scummvm-tools.

In commit 7a68e7088df the configure script was modified to silently
ignore some options, that are not needed for scummvm-tools, but are valid
for the configure script generated by GNU Autotools, so the configure
macro for RPM-based distributions can be used when building a rpm
package for them.

Unfortunately the configure script, as used by scummvm-tools uses the --host
option to determine the target system it will actually be build for.
Autotools based configure scripts have a --target option for such a
purpose, and use the --host option to determine the system the build
is performed on.

For that reason there should be a way to discard the parameters passed
to the configure script with the --host option.  The easiest approach
to achieve this goal, is to have an environment variable, which when
set influences the configure script to ignore the parameters of the
--host option.

Thus we introduced a variable called 'CONFIGURE_NO_HOST', that will
when set to anything, but an empty value, before invoking the configure
script, have the parameters of the --host option take no influence on
the configure stage (and the build stage as well).

Changed paths:
    configure


diff --git a/configure b/configure
index 18906a419..1a455d365 100755
--- a/configure
+++ b/configure
@@ -417,6 +417,7 @@ Some influential environment variables:
                      nonstandard directory <lib dir>
   CXX                C++ compiler command
   CXXFLAGS           C++ compiler flags
+  CONFIGURE_NO_HOST  Ignore the cross-compile target set by the --host= option
   CPPFLAGS           C++ preprocessor flags, e.g. -I<include dir> if you have
                      headers in a nonstandard directory <include dir>
   PKG_CONFIG_LIBDIR  list of directories where pkg-config ‘.pc’ files are
@@ -543,7 +544,11 @@ for ac_option in $@; do
 		_enable_prof=yes
 		;;
 	--host=*)
-		_host=`echo $ac_option | cut -d '=' -f 2`
+               if test -z "$CONFIGURE_NO_HOST"; then
+                       _host=`echo $ac_option | cut -d '=' -f 2`
+               else
+                       echo "Ignoring --host option!" >&2
+               fi
 		;;
 	--prefix=*)
 		_prefix=`echo $ac_option | cut -d '=' -f 2`