diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-11-30 17:18:04 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-11-30 17:18:04 -0500 |
| commit | 175edafd1f30a78643359b56c5545b5e7aabfb50 (patch) | |
| tree | c3e08ed290a0519c14ab03b91c6e5b9cf178943c | |
| parent | 5550a9c385198ac51d2f3b17be2f6ff9f886d76d (diff) | |
Cope with cross-compiling when checking for a random-number source.
Commit 16f96c74d neglected to consider the possibility of cross-compiling,
causing cross-compiles to fail at the configure stage unless you'd
selected --with-openssl. Since we're now more or less assuming that
/dev/urandom is available everywhere, it seems reasonable to assume
that the cross-compile target has it too, rather than failing.
Per complaint from Vincas Dargis. Back-patch to v14 where this came in.
Discussion: https://postgr.es/m/0dc14a31-acaf-8cae-0df4-a87339b22bd9@gmail.com
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/configure b/configure index 29a654ec51c..ecf14476a06 100755 --- a/configure +++ b/configure @@ -10468,7 +10468,7 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; } fi -if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then +if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then if test -z "$ZIC"; then for ac_prog in zic do @@ -18702,6 +18702,9 @@ $as_echo "OpenSSL" >&6; } elif test x"$PORTNAME" = x"win32" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows native" >&5 $as_echo "Windows native" >&6; } +elif test x"$cross_compiling" = x"yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming /dev/urandom" >&5 +$as_echo "assuming /dev/urandom" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/urandom" >&5 $as_echo "/dev/urandom" >&6; } diff --git a/configure.ac b/configure.ac index 54a9dec0925..4d37c2312c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1126,7 +1126,7 @@ if test "$with_python" = yes; then PGAC_CHECK_PYTHON_EMBED_SETUP fi -if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then +if test x"$cross_compiling" = x"yes" && test -z "$with_system_tzdata"; then PGAC_PATH_PROGS(ZIC, zic) if test -z "$ZIC"; then AC_MSG_ERROR([ @@ -2257,6 +2257,8 @@ if test x"$with_ssl" = x"openssl" ; then AC_MSG_RESULT([OpenSSL]) elif test x"$PORTNAME" = x"win32" ; then AC_MSG_RESULT([Windows native]) +elif test x"$cross_compiling" = x"yes"; then + AC_MSG_RESULT([assuming /dev/urandom]) else AC_MSG_RESULT([/dev/urandom]) AC_CHECK_FILE([/dev/urandom], [], []) |