Author: timbo
Date: Thu Mar 28 11:42:27 2013
New Revision: 15594
Modified:
dbi/trunk/Makefile.PL
Log:
drop old thread warning from Makefile.PL
Modified: dbi/trunk/Makefile.PL
==============================================================================
--- dbi/trunk/Makefile.PL (original)
+++ dbi/trunk/Makefile.PL Thu Mar 28 11:42:27 2013
@@ -27,7 +27,7 @@
my $is_developer = ((-d ".svn" || -d ".git") && -f "MANIFEST.SKIP");
$::opt_v = 0;
-$::opt_thread = 1; # thread if we can, use "-nothread" to disable
+$::opt_thread = $Config{useithreads}; # thread if we can, use "-nothread" to
disable
$::opt_g = 0;
$::opt_g = 1 if $is_developer && $ENV{LOGNAME} && $ENV{LOGNAME} eq 'timbo'; #
it's me! (probably)
@@ -48,41 +48,6 @@
sleep 1;
}
-if ($Config{useithreads}) {
- if ($] < 5.012) { # recent perls are reasonably fre of thread bugs
- print "\n";
- print "*** You are using a perl configured with threading enabled.\n";
- print "*** You should be aware that using multiple threads is\n";
- print "*** not recommended for production environments.\n";
- print "\n";
- sleep 1;
- }
- $::opt_thread = 1;
-}
-else {
-
- if ($Config{archname} =~ /\bthread/ && $::opt_thread) {
- # oh dear... tell it like it is:
- print "\n";
- print "DBI versions from 1.29 onwards no longer support the old
style\n";
- print "of perl threading (now known as '5005 threads'). It is badly
flawed\n";
- print "and could never be safe to use in production environments.\n\n";
- print "If you are using multiple threads you are *strongly* encouraged
to\n";
- print "upgrade to perl 5.8.2 or later.\n";
- print "If you are not using multiple threads you are *strongly*
encouraged to\n";
- print "upgrade to at least 5.6.1 (preferably perl 5.8.2 or later.)\n";
- print "or at the very least rebuild this version with threading
disabled.\n";
- print "If you have stick with your current build of perl...\n";
- print "then you also have to stick with DBI 1.28 for safety.\n";
- print "Or if *desparate* you may be able to build this DBI using 'perl
Makefile.PL -nothread' but\n";
- print "but but, that will have *no* logic to handle threads because the
logic\n";
- print "that was there for 5005 threads has now been removed! You have
been warned.\n";
- die "*** ABORTED.\n";
- }
-
- $::opt_thread = 0;
-}
-
my %opts = (
NAME => 'DBI',
AUTHOR => 'Tim Bunce ([email protected])',
