From 2f02f5626c13c8d4556368b79e77d341b87f5d97 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Tue, 12 Mar 2024 18:10:32 +0100 Subject: [PATCH] Update configure scripts --- erts/configure | 18 ++++++-- lib/common_test/test_server/configure | 11 +++++ lib/crypto/configure | 59 ++++++++++++++++----------- lib/erl_interface/configure | 59 ++++++++++++++++----------- lib/megaco/configure | 59 ++++++++++++++++----------- make/configure | 59 ++++++++++++++++----------- 6 files changed, 165 insertions(+), 100 deletions(-) diff --git a/erts/configure b/erts/configure index 709bc5b74e3f..509f7ffe1e26 100755 --- a/erts/configure +++ b/erts/configure @@ -7866,6 +7866,17 @@ See 'config.log' for more details" "$LINENO" 5; } ;; #( esac fi fi +if test "$enable_year2038,$ac_have_year2038" = yes,no +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "could not enable timestamps after mid-January 2038. +This package recommends support for these later +timestamps. However, to proceed with signed 32-bit +time_t even though it will fail then, configure with +'--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } +fi ac_header= ac_cache= for ac_item in $ac_header_c_list @@ -7939,10 +7950,9 @@ then : cat >> $ERL_TOP/erts/CONF_INFO <&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "could not enable timestamps after mid-January 2038. +This package recommends support for these later +timestamps. However, to proceed with signed 32-bit +time_t even though it will fail then, configure with +'--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } +fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 printf %s "checking for sin in -lm... " >&6; } diff --git a/lib/crypto/configure b/lib/crypto/configure index 8f9b451b5d70..12baecdd04f7 100755 --- a/lib/crypto/configure +++ b/lib/crypto/configure @@ -4638,6 +4638,33 @@ esac fi fi +if test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no +then : + # If we're not cross compiling and 'touch' works with a large + # timestamp, then we can presume the system supports wider time_t + # *somehow* and we just weren't able to detect it. One common + # case that we deliberately *don't* probe for is a system that + # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers + # wide time_t. (It would be inappropriate for us to override an + # intentional use of -m32.) Error out, demanding use of + # --disable-year2038 if this is intentional. + if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null +then : + case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( + *'Feb 7 2106'* | *'Feb 7 17:10'*) : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "this system appears to support timestamps after +mid-January 2038, but no mechanism for enabling wide +'time_t' was detected. Did you mean to build a 64-bit +binary? (E.g., 'CC=\"${CC} -m64\"'.) To proceed with +32-bit time_t, configure with '--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } ;; #( + *) : + ;; +esac +fi +fi @@ -5180,32 +5207,16 @@ fi # Large file support and 8-byte time_t by default -if test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no +if test "$enable_year2038,$ac_have_year2038" = yes,no then : - # If we're not cross compiling and 'touch' works with a large - # timestamp, then we can presume the system supports wider time_t - # *somehow* and we just weren't able to detect it. One common - # case that we deliberately *don't* probe for is a system that - # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers - # wide time_t. (It would be inappropriate for us to override an - # intentional use of -m32.) Error out, demanding use of - # --disable-year2038 if this is intentional. - if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null -then : - case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( - *'Feb 7 2106'* | *'Feb 7 17:10'*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "this system appears to support timestamps after -mid-January 2038, but no mechanism for enabling wide -'time_t' was detected. Did you mean to build a 64-bit -binary? (E.g., 'CC=\"${CC} -m64\"'.) To proceed with -32-bit time_t, configure with '--disable-year2038'. -See 'config.log' for more details" "$LINENO" 5; } ;; #( - *) : - ;; -esac -fi +as_fn_error $? "could not enable timestamps after mid-January 2038. +This package recommends support for these later +timestamps. However, to proceed with signed 32-bit +time_t even though it will fail then, configure with +'--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } fi USER_LD=$LD diff --git a/lib/erl_interface/configure b/lib/erl_interface/configure index 4e9ab18ead8b..9eb2eabe2707 100755 --- a/lib/erl_interface/configure +++ b/lib/erl_interface/configure @@ -4897,6 +4897,33 @@ esac fi +fi +if test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no +then : + # If we're not cross compiling and 'touch' works with a large + # timestamp, then we can presume the system supports wider time_t + # *somehow* and we just weren't able to detect it. One common + # case that we deliberately *don't* probe for is a system that + # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers + # wide time_t. (It would be inappropriate for us to override an + # intentional use of -m32.) Error out, demanding use of + # --disable-year2038 if this is intentional. + if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null +then : + case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( + *'Feb 7 2106'* | *'Feb 7 17:10'*) : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "this system appears to support timestamps after +mid-January 2038, but no mechanism for enabling wide +'time_t' was detected. Did you mean to build a 64-bit +binary? (E.g., 'CC=\"${CC} -m64\"'.) To proceed with +32-bit time_t, configure with '--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } ;; #( + *) : + ;; +esac +fi fi ac_header= ac_cache= for ac_item in $ac_header_c_list @@ -4930,32 +4957,16 @@ fi # Large file support and 8-byte time_t by default -if test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no +if test "$enable_year2038,$ac_have_year2038" = yes,no then : - # If we're not cross compiling and 'touch' works with a large - # timestamp, then we can presume the system supports wider time_t - # *somehow* and we just weren't able to detect it. One common - # case that we deliberately *don't* probe for is a system that - # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers - # wide time_t. (It would be inappropriate for us to override an - # intentional use of -m32.) Error out, demanding use of - # --disable-year2038 if this is intentional. - if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null -then : - case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( - *'Feb 7 2106'* | *'Feb 7 17:10'*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "this system appears to support timestamps after -mid-January 2038, but no mechanism for enabling wide -'time_t' was detected. Did you mean to build a 64-bit -binary? (E.g., 'CC=\"${CC} -m64\"'.) To proceed with -32-bit time_t, configure with '--disable-year2038'. -See 'config.log' for more details" "$LINENO" 5; } ;; #( - *) : - ;; -esac -fi +as_fn_error $? "could not enable timestamps after mid-January 2038. +This package recommends support for these later +timestamps. However, to proceed with signed 32-bit +time_t even though it will fail then, configure with +'--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } fi USER_LD=$LD diff --git a/lib/megaco/configure b/lib/megaco/configure index 6f0e8794235c..130e594d0492 100755 --- a/lib/megaco/configure +++ b/lib/megaco/configure @@ -4695,6 +4695,33 @@ esac fi fi +if test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no +then : + # If we're not cross compiling and 'touch' works with a large + # timestamp, then we can presume the system supports wider time_t + # *somehow* and we just weren't able to detect it. One common + # case that we deliberately *don't* probe for is a system that + # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers + # wide time_t. (It would be inappropriate for us to override an + # intentional use of -m32.) Error out, demanding use of + # --disable-year2038 if this is intentional. + if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null +then : + case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( + *'Feb 7 2106'* | *'Feb 7 17:10'*) : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "this system appears to support timestamps after +mid-January 2038, but no mechanism for enabling wide +'time_t' was detected. Did you mean to build a 64-bit +binary? (E.g., 'CC=\"${CC} -m64\"'.) To proceed with +32-bit time_t, configure with '--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } ;; #( + *) : + ;; +esac +fi +fi @@ -5237,32 +5264,16 @@ fi # Large file support and 8-byte time_t by default -if test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no +if test "$enable_year2038,$ac_have_year2038" = yes,no then : - # If we're not cross compiling and 'touch' works with a large - # timestamp, then we can presume the system supports wider time_t - # *somehow* and we just weren't able to detect it. One common - # case that we deliberately *don't* probe for is a system that - # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers - # wide time_t. (It would be inappropriate for us to override an - # intentional use of -m32.) Error out, demanding use of - # --disable-year2038 if this is intentional. - if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null -then : - case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( - *'Feb 7 2106'* | *'Feb 7 17:10'*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "this system appears to support timestamps after -mid-January 2038, but no mechanism for enabling wide -'time_t' was detected. Did you mean to build a 64-bit -binary? (E.g., 'CC=\"${CC} -m64\"'.) To proceed with -32-bit time_t, configure with '--disable-year2038'. -See 'config.log' for more details" "$LINENO" 5; } ;; #( - *) : - ;; -esac -fi +as_fn_error $? "could not enable timestamps after mid-January 2038. +This package recommends support for these later +timestamps. However, to proceed with signed 32-bit +time_t even though it will fail then, configure with +'--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } fi USER_LD=$LD diff --git a/make/configure b/make/configure index 8fc45bb0ce7a..65b5597782a2 100755 --- a/make/configure +++ b/make/configure @@ -6027,6 +6027,33 @@ esac fi fi +if test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no +then : + # If we're not cross compiling and 'touch' works with a large + # timestamp, then we can presume the system supports wider time_t + # *somehow* and we just weren't able to detect it. One common + # case that we deliberately *don't* probe for is a system that + # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers + # wide time_t. (It would be inappropriate for us to override an + # intentional use of -m32.) Error out, demanding use of + # --disable-year2038 if this is intentional. + if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null +then : + case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( + *'Feb 7 2106'* | *'Feb 7 17:10'*) : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} +as_fn_error $? "this system appears to support timestamps after +mid-January 2038, but no mechanism for enabling wide +'time_t' was detected. Did you mean to build a 64-bit +binary? (E.g., 'CC=\"${CC} -m64\"'.) To proceed with +32-bit time_t, configure with '--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } ;; #( + *) : + ;; +esac +fi +fi @@ -6569,32 +6596,16 @@ fi # Large file support and 8-byte time_t by default -if test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no +if test "$enable_year2038,$ac_have_year2038" = yes,no then : - # If we're not cross compiling and 'touch' works with a large - # timestamp, then we can presume the system supports wider time_t - # *somehow* and we just weren't able to detect it. One common - # case that we deliberately *don't* probe for is a system that - # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers - # wide time_t. (It would be inappropriate for us to override an - # intentional use of -m32.) Error out, demanding use of - # --disable-year2038 if this is intentional. - if TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null -then : - case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in #( - *'Feb 7 2106'* | *'Feb 7 17:10'*) : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} -as_fn_error $? "this system appears to support timestamps after -mid-January 2038, but no mechanism for enabling wide -'time_t' was detected. Did you mean to build a 64-bit -binary? (E.g., 'CC=\"${CC} -m64\"'.) To proceed with -32-bit time_t, configure with '--disable-year2038'. -See 'config.log' for more details" "$LINENO" 5; } ;; #( - *) : - ;; -esac -fi +as_fn_error $? "could not enable timestamps after mid-January 2038. +This package recommends support for these later +timestamps. However, to proceed with signed 32-bit +time_t even though it will fail then, configure with +'--disable-year2038'. +See 'config.log' for more details" "$LINENO" 5; } fi USER_LD=$LD