From 8a14fe45d3cc09104c2ebf0bf3cf40dc71615410 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Sun, 9 Jul 2023 07:50:13 -0600 Subject: [PATCH] Enable thread-safe locales on some freebsd versions This had been disabled in the hints file due to bugs, which perl now works around, so reenable (and reformat some lines for clarity) --- hints/freebsd.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hints/freebsd.sh b/hints/freebsd.sh index 294c871894f5..e93c4dafd3c4 100644 --- a/hints/freebsd.sh +++ b/hints/freebsd.sh @@ -327,13 +327,15 @@ d_printf_format_null='undef' # Experiments have shown that this doesn't fully work. The first kernel we know it works is 1200056 FREEBSD_KERNEL_VERSION=`uname -U` -#if [ $FREEBSD_KERNEL_VERSION -lt 1003507 ] || \ -# [ $FREEBSD_KERNEL_VERSION -ge 1100000 ] && [ $FREEBSD_KERNEL_VERSION -lt 1100502 ] || \ -# [ $FREEBSD_KERNEL_VERSION -ge 1200000 ] && [ $FREEBSD_KERNEL_VERSION -lt 1200004 ] -if [ $FREEBSD_KERNEL_VERSION -lt 1200056 ] # But other bugs remain; see below -then - d_uselocale='undef' -fi +#if [ $FREEBSD_KERNEL_VERSION -lt 1003507 \ +# -o \( $FREEBSD_KERNEL_VERSION -ge 1100000 \ +# -a $FREEBSD_KERNEL_VERSION -lt 1100502 \) \ +# -o \( $FREEBSD_KERNEL_VERSION -ge 1200000 \ +# -a $FREEBSD_KERNEL_VERSION -lt 1200004 \) ] +#if [ $FREEBSD_KERNEL_VERSION -lt 1200056 ] # But other bugs remain; see below +#then +# d_uselocale='undef' +#fi # See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265950 ccflags="${ccflags} -DNO_POSIX_2008_LOCALE"