Trac #31538: i386: openssl and tachyon attempt 64-bit build and fail

For example on `ubuntu-bionic-i386-minimal`
https://github.com/mkoeppe/sage/runs/2161532075: `openssl` fails with:
{{{
make depend && make _build_sw
gcc  -I. -Iinclude -Iapps/include  -fPIC -pthread -m64 -Wa,--noexecstack
-O2 -g -march=native -DOPENSSL_USE_NODELETE -DL_ENDIAN -DOPENSSL_PIC
-DOPENSSLDIR="\"/sage/local/openssl\""
-DENGINESDIR="\"/sage/local/lib64/engines-3\""
-DMODULESDIR="\"/sage/local/lib64/ossl-modules\""
-DOPENSSL_BUILDING_OPENSSL -DNDEBUG  -MMD -MF apps/lib/libapps-lib-
app_params.d.tmp -MT apps/lib/libapps-lib-app_params.o -c -o apps/lib
/libapps-lib-app_params.o apps/lib/app_params.c
In file included from /usr/lib/gcc/i686-linux-gnu/7/include-
fixed/limits.h:194:0,
                 from /usr/lib/gcc/i686-linux-gnu/7/include-
fixed/syslimits.h:7,
                 from /usr/lib/gcc/i686-linux-gnu/7/include-
fixed/limits.h:34,
                 from ./e_os.h:13,
                 from apps/include/apps.h:13,
                 from apps/lib/app_params.c:10:
/usr/include/limits.h:26:10: fatal error: bits/libc-header-start.h: No
such file or directory
 #include <bits/libc-header-start.h>
          ^~~~~~~~~~~~~~~~~~~~~~~~~~
}}}

Same failure mode also for `tachyon`
(https://github.com/mkoeppe/sage/runs/2177818373 for `ubuntu-
bionic-i386-minimal`).

Critical for Sage 9.3 because it stops us from seeing other build
failures on `i386-minimal` platforms

URL: https://trac.sagemath.org/31538
Reported by: mkoeppe
Ticket author(s): Matthias Koeppe
Reviewer(s): Dima Pasechnik

Author: Release Manager

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=df2f6839c4a19b7d21c4f387df24596fcfa2b459
-md5=f307be6d68e25b3924cc93d2bcc9dc04
-cksum=1158861891
+sha1=a38ba439948866832495e453b2febed61a232256
+md5=72ad56533ec90f5bcec51d4005387f15
+cksum=2631020116

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-6e084f9dbad96c3a166732efb36fe71acd2e7ba2
+1a6e82a160b277ae72ecfd7406060a28ab9c3eb4

build/pkgs/openssl/spkg-install.in

@@ -1,9 +1,4 @@
-if [ -z "$SAGE_LOCAL" ]; then
-    echo >&2 "SAGE_LOCAL undefined ... exiting"
-    echo >&2 "Maybe run 'sage --sh'?"
-    exit 1
-fi
-
+# -*- shell-script -*-
 cd src
 
 # ./config picks up these environment variables if they are set, instead of using uname components
@@ -12,26 +7,24 @@ unset RELEASE
 unset SYSTEM
 unset BUILD
 
-# Building on OS X Lion 64-bit seems to fail unless we build a 64-bit library.
+extra_config_args=
+target=$($CC -dumpmachine 2> /dev/null)
 echo
-echo "Configuring openssl..."
-./config --prefix="$SAGE_LOCAL" --openssldir="$SAGE_LOCAL"/openssl shared
+echo "Configuring openssl for target reported by $CC -dumpmachine: $target"
+case "$target" in
+    # Trac #31538: On 64 bit kernels running a 32 bit system, use the target of
+    # the configured compiler
+    i?86-*linux*)
+        extra_config_args="linux-x86"
+        ;;
+esac
 
-echo "Building openssl..."
-$MAKE
-
-if [ $? -ne 0 ]; then
-    echo >&2 "Error building openssl."
-    exit 1
-fi
-echo
+./config --prefix="$SAGE_LOCAL" --openssldir="$SAGE_LOCAL"/openssl shared $extra_config_args
 
 
+echo "Building openssl..."
+$MAKE || sdh_die "Error building openssl."
 
 echo "Installing openssl..."
 # installing the docs fails often, skip
-$MAKE install_sw
-if [ $? -ne 0 ]; then
-    echo >&2 "Error installing openssl."
-    exit 1
-fi
+$MAKE install_sw || sdh_die "Error installing openssl."

build/pkgs/tachyon/spkg-install.in

@@ -17,20 +17,20 @@ case "$UNAME" in
     TARGET=bsd
     ;;
 "Linux")
-    case "`uname -m`" in
-    i[3456]86)
+    case "$($CC -dumpmachine)" in
+    i[3456]86*)
         TARGET=linux-thr
         ;;
-    ia64)
+    ia64*)
         TARGET=linux-ia64-thr
         ;;
-    amd64|x86_64)
+    amd64*|x86_64*)
         TARGET=linux-64-thr
         ;;
     ppc*|powerpc*)
         TARGET=linux-ppc
         ;;
-    armv6l|armv7l)
+    armv6l*|armv7l*)
         TARGET=linux-arm-thr
         ;;
     esac