X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flocale.t;h=b4ba02d8b7eb2aede6fdd00bd1557904a09f0904;hb=34ba6322b644154d55680c95808981776852ae24;hp=a294d2fbc2b54d2759ce60d96a592f61766269c3;hpb=cd19b65c5ecbc051ae6b3ed0644e976003b04fce;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/locale.t b/lib/locale.t
index a294d2f..b4ba02d 100644
--- a/lib/locale.t
+++ b/lib/locale.t
@@ -52,7 +52,7 @@ my $last = $have_setlocale ? &last : &last_without_setlocale;
 
 print "1..$last\n";
 
-use vars qw(&LC_ALL);
+sub LC_ALL ();
 
 $a = 'abc %';
 
@@ -382,6 +382,10 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 if (-x "/usr/bin/locale" && open(LOCALES, "/usr/bin/locale -a 2>/dev/null|")) {
     while (<LOCALES>) {
+	# It seems that /usr/bin/locale steadfastly outputs 8 bit data, which
+	# ain't great when we're running this testPERL_UNICODE= so that utf8
+	# locales will cause all IO hadles to default to (assume) utf8
+	next unless utf8::valid($_);
         chomp;
 	trylocale($_);
     }
@@ -433,6 +437,15 @@ if (-x "/usr/bin/locale" && open(LOCALES, "/usr/bin/locale -a 2>/dev/null|")) {
 
 setlocale(LC_ALL, "C");
 
+if ($^O eq 'darwin') {
+    # Darwin 8/Mac OS X 10.4 has bad Catalan locales: perl bug #35895,
+    # Apple bug ID# 4139653. It also has a problem in Byelorussian.
+    if ($Config{osvers} ge '8' and $Config{osvers} le '8.3.0') {
+	debug "# Skipping eu_ES, be_BY locales -- buggy in Darwin\n";
+	@Locale = grep ! m/^(eu_ES|be_BY.CP1131$)/, @Locale;
+    }
+}
+
 @Locale = sort @Locale;
 
 debug "# Locales =\n";