diff options
| author | Rob Austein <sra@hactrn.net> | 2013-03-08 04:32:55 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-03-08 04:32:55 +0000 |
| commit | bdb0030d7a78ea608f3fa0591565275cf203147b (patch) | |
| tree | f6cd73fe64af1f33282f30deb2501a38ae6bac09 | |
| parent | 51e0b2a082e3abd88ff909f28e15ab963eabf622 (diff) | |
Whack OpenSSL configuration to pull its notion of the CPU from
autoconf rather than deducing this on its own, so that we can use
pbuilder and pbuilder-dist to build both 32-bit and 64-bit packages on
the same 64-bit Ubuntu machine. See #423.
svn path=/trunk/; revision=5124
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 17 insertions, 4 deletions
@@ -2294,6 +2294,12 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + +# I'm not sure we should really be using the $host_* variables as we +# are, some of the stuff we're doing with them looks more like +# $target_* to me now, but on the theory that we should not fix things +# that aren't broken, stick with $host_* for now. + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 @@ -5000,9 +5006,9 @@ $as_echo_n "checking what configuration target to use when building OpenSSL... " *) if test $build_openssl_asm = yes then - OPENSSL_CONFIG_COMMAND='./config' + OPENSSL_CONFIG_COMMAND="MACHINE=$host_cpu ./config" else - OPENSSL_CONFIG_COMMAND='./config no-asm' + OPENSSL_CONFIG_COMMAND="MACHINE=$host_cpu ./config no-asm" fi ;; esac diff --git a/configure.ac b/configure.ac index 00731807..a61ad2ce 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,14 @@ dnl AC_REVISION([$Revision$]) AC_CONFIG_SRCDIR([rcynic/rcynic.c]) AC_CONFIG_AUX_DIR([buildtools]) + +# I'm not sure we should really be using the $host_* variables as we +# are, some of the stuff we're doing with them looks more like +# $target_* to me now, but on the theory that we should not fix things +# that aren't broken, stick with $host_* for now. + AC_CANONICAL_HOST +dnl AC_CANONICAL_TARGET # Remember whether CFLAGS or LDFLAGS were set explictly. This has to # come early in the script, before we mess it up testing things. @@ -653,9 +660,9 @@ then *) if test $build_openssl_asm = yes then - OPENSSL_CONFIG_COMMAND='./config' + OPENSSL_CONFIG_COMMAND="MACHINE=$host_cpu ./config" else - OPENSSL_CONFIG_COMMAND='./config no-asm' + OPENSSL_CONFIG_COMMAND="MACHINE=$host_cpu ./config no-asm" fi ;; esac |