Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit175edaf

Browse files
committed
Cope with cross-compiling when checking for a random-number source.
Commit16f96c7 neglected to consider the possibility of cross-compiling,causing cross-compiles to fail at the configure stage unless you'dselected --with-openssl. Since we're now more or less assuming that/dev/urandom is available everywhere, it seems reasonable to assumethat 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
1 parent5550a9c commit175edaf

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

‎configure

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10468,7 +10468,7 @@ $as_echo "${python_libspec} ${python_additional_libs}" >&6; }
1046810468

1046910469
fi
1047010470

10471-
if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then
10471+
if testx"$cross_compiling" =x"yes" && test -z "$with_system_tzdata"; then
1047210472
if test -z "$ZIC"; then
1047310473
for ac_prog in zic
1047410474
do
@@ -18702,6 +18702,9 @@ $as_echo "OpenSSL" >&6; }
1870218702
elif test x"$PORTNAME" = x"win32" ; then
1870318703
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows native" >&5
1870418704
$as_echo "Windows native" >&6; }
18705+
elif test x"$cross_compiling" = x"yes"; then
18706+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming /dev/urandom" >&5
18707+
$as_echo "assuming /dev/urandom" >&6; }
1870518708
else
1870618709
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/urandom" >&5
1870718710
$as_echo "/dev/urandom" >&6; }

‎configure.ac

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ if test "$with_python" = yes; then
11261126
PGAC_CHECK_PYTHON_EMBED_SETUP
11271127
fi
11281128

1129-
if test "$cross_compiling" = yes && test -z "$with_system_tzdata"; then
1129+
if testx"$cross_compiling" =x"yes" && test -z "$with_system_tzdata"; then
11301130
PGAC_PATH_PROGS(ZIC, zic)
11311131
if test -z "$ZIC"; then
11321132
AC_MSG_ERROR([
@@ -2257,6 +2257,8 @@ if test x"$with_ssl" = x"openssl" ; then
22572257
AC_MSG_RESULT([OpenSSL])
22582258
elif test x"$PORTNAME" = x"win32" ; then
22592259
AC_MSG_RESULT([Windows native])
2260+
elif test x"$cross_compiling" = x"yes"; then
2261+
AC_MSG_RESULT([assuming /dev/urandom])
22602262
else
22612263
AC_MSG_RESULT([/dev/urandom])
22622264
AC_CHECK_FILE([/dev/urandom],[],[])

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp