From: Albert Chin-A-Young Date: Tue, 3 Jun 2003 15:44:14 +0000 (+0000) Subject: * tests/defs, tests/demo-conf.test, tests/demo-nofast.test, X-Git-Tag: help~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57c1e5d6dc13095ab85ee578248548fa5a2c6ae6;p=thirdparty%2Flibtool.git * tests/defs, tests/demo-conf.test, tests/demo-nofast.test, tests/demo-nopic.test, tests/demo-pic.test, tests/demo-shared.test, tests/demo-static.test, tests/depdemo-conf.test, tests/depdemo-nofast.test, tests/depdemo-shared.test, tests/depdemo-static.test: Pass build system type to tests to support environment where default system type not equal to build system type (eg. 64-bit HP-UX). --- diff --git a/ChangeLog b/ChangeLog index 79a369558..caa1451ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2003-06-03 Albert Chin-A-Young + + * tests/defs, tests/demo-conf.test, tests/demo-nofast.test, + tests/demo-nopic.test, tests/demo-pic.test, + tests/demo-shared.test, tests/demo-static.test, + tests/depdemo-conf.test, tests/depdemo-nofast.test, + tests/depdemo-shared.test, tests/depdemo-static.test: + Pass build system type to tests to support environment + where default system type not equal to build system type + (eg. 64-bit HP-UX). + 2003-06-03 Peter O'Gorman * libtool.m4 (darwin): Remove checks for Apple-specific gcc. diff --git a/tests/defs b/tests/defs index 44df0dc6e..8713e853f 100644 --- a/tests/defs +++ b/tests/defs @@ -38,6 +38,9 @@ fi # Extract CC from the libtool configuration eval `$libtool --config | grep '^CC='` +# Extract host from the libtool configuration +eval `$libtool --config | grep '^host='` + # Disable usage of config.site for autoconf, unless DJGPP is present. # The DJGPP port of autoconf requires config.site, to work correctly. if test -z "$DJGPP"; then diff --git a/tests/demo-conf.test b/tests/demo-conf.test index 5f8daf404..689644528 100755 --- a/tests/demo-conf.test +++ b/tests/demo-conf.test @@ -25,7 +25,7 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../demo (prefix=$prefix)" -${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --build=$host || exit 1 if grep '^build_old_libs=yes' libtool > /dev/null && grep '^build_libtool_libs=yes' libtool > /dev/null; then : diff --git a/tests/demo-nofast.test b/tests/demo-nofast.test index 0e1d8ae1e..73ed59fd7 100755 --- a/tests/demo-nofast.test +++ b/tests/demo-nofast.test @@ -25,7 +25,7 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../demo (prefix=$prefix)" -${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --enable-fast-install=no || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --build=$host --enable-fast-install=no || exit 1 if grep '^hardcode_action=relink' libtool > /dev/null; then rm -f Makefile && exit 77 diff --git a/tests/demo-nopic.test b/tests/demo-nopic.test index 69e995388..f2a4fa662 100755 --- a/tests/demo-nopic.test +++ b/tests/demo-nopic.test @@ -25,6 +25,6 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../demo (prefix=$prefix) with --without-pic" -${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --with-pic=no || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --build=$host --with-pic=no || exit 1 exit 0 diff --git a/tests/demo-pic.test b/tests/demo-pic.test index f3ddb3b73..69565bc61 100755 --- a/tests/demo-pic.test +++ b/tests/demo-pic.test @@ -25,6 +25,6 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../demo (prefix=$prefix) with --with-pic" -${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --with-pic=yes || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --build=$host --with-pic=yes || exit 1 exit 0 diff --git a/tests/demo-shared.test b/tests/demo-shared.test index ce80a38d5..2f00da0e8 100755 --- a/tests/demo-shared.test +++ b/tests/demo-shared.test @@ -25,7 +25,7 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../demo (prefix=$prefix) with --disable-static" -${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --disable-static || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --build=$host --disable-static || exit 1 if grep '^build_old_libs=no' libtool > /dev/null && grep '^build_libtool_libs=yes' libtool > /dev/null; then : diff --git a/tests/demo-static.test b/tests/demo-static.test index 9672c390d..58d9544ed 100755 --- a/tests/demo-static.test +++ b/tests/demo-static.test @@ -25,7 +25,7 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../demo (prefix=$prefix) with --disable-shared" -${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --disable-shared || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../demo/configure --srcdir=$srcdir/../demo --prefix=$prefix --build=$host --disable-shared || exit 1 if grep '^build_old_libs=yes' libtool > /dev/null && grep '^build_libtool_libs=no' libtool > /dev/null; then : diff --git a/tests/depdemo-conf.test b/tests/depdemo-conf.test index 927546637..da24f98fb 100755 --- a/tests/depdemo-conf.test +++ b/tests/depdemo-conf.test @@ -25,7 +25,7 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../depdemo (prefix=$prefix)" -${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --build=$host || exit 1 if grep '^build_old_libs=yes' libtool > /dev/null && grep '^build_libtool_libs=yes' libtool > /dev/null; then : diff --git a/tests/depdemo-nofast.test b/tests/depdemo-nofast.test index a8f4861de..2cbb25d2f 100755 --- a/tests/depdemo-nofast.test +++ b/tests/depdemo-nofast.test @@ -25,7 +25,7 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../depdemo (prefix=$prefix)" -${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --enable-fast-install=no || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --build=$host --enable-fast-install=no || exit 1 if grep '^hardcode_action=relink' libtool > /dev/null; then rm -f Makefile && exit 77 diff --git a/tests/depdemo-shared.test b/tests/depdemo-shared.test index d4e593eee..e411fee66 100755 --- a/tests/depdemo-shared.test +++ b/tests/depdemo-shared.test @@ -25,7 +25,7 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../depdemo (prefix=$prefix) with --disable-static" -${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --disable-static || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --build=$host --disable-static || exit 1 if grep '^build_old_libs=no' libtool > /dev/null && grep '^build_libtool_libs=yes' libtool > /dev/null; then : diff --git a/tests/depdemo-static.test b/tests/depdemo-static.test index e889822d3..c0bd763c2 100755 --- a/tests/depdemo-static.test +++ b/tests/depdemo-static.test @@ -25,7 +25,7 @@ rm -f config.cache # Configure the demonstration. echo "= Configuring in ../depdemo (prefix=$prefix) with --disable-shared" -${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --disable-shared || exit 1 +${CONFIG_SHELL-/bin/sh} $srcdir/../depdemo/configure --srcdir=$srcdir/../depdemo --prefix=$prefix --build=$host --disable-shared || exit 1 if grep '^build_old_libs=yes' libtool > /dev/null && grep '^build_libtool_libs=no' libtool > /dev/null; then :