From 3b9dcea28e43a643dcb066fad645c839c9eb636d Mon Sep 17 00:00:00 2001 From: Anton Berezin Date: Mon, 20 Feb 2006 20:24:36 +0000 Subject: Upgrade to 5.8.8. Also: Do not strip when built with -DWITH_DEBUGGING. [1] Do not build non-threaded perl with -pthread. [2] Add rebuild-xs target which should be used when perl-after-upgrade does not do its job adequately. [3] Fix perl-after-upgrade to handle threaded perl. [4] Submitted by: John Narron [2], Sergey Prikhodko [4], parv@pair.com [1], pavel@ctk.ru [2], skv [3], vasilis [2] PR: 83223 [4], 83767 [2], 84255 [2], 89443 [1], 90832 [2] --- lang/perl5.16/files/perl-after-upgrade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lang/perl5.16/files/perl-after-upgrade') diff --git a/lang/perl5.16/files/perl-after-upgrade b/lang/perl5.16/files/perl-after-upgrade index a60cd8e93ecb..fd787edab1e8 100644 --- a/lang/perl5.16/files/perl-after-upgrade +++ b/lang/perl5.16/files/perl-after-upgrade @@ -411,7 +411,7 @@ sub might_need_to_fix return 1; } for ($pkg->lines) { - if (/^\@pkgdep\s+perl-($fuzzy_source)\S*\s*$/) { + if (/^\@pkgdep\s+perl-(threaded-)?($fuzzy_source)\S*\s*$/) { return 1; } } @@ -581,10 +581,10 @@ while (my $pkg = $db->next) { } if (/^\@cwd\s+(\S+)\s*$/) { $prefix = $1; - } elsif (/^\@pkgdep\s+perl-($fuzzy_source)\S*\s*$/) { - if ($target ne $1) { - my $perlver = $1; - s|perl-\Q$perlver\E|perl-$target|; + } elsif (/^\@pkgdep\s+perl-(threaded-)?($fuzzy_source)\S*\s*$/) { + if ($target ne $2) { + my $perlver = $2; + s|perl-(threaded-)?\Q$perlver\E|perl-$target|; } } my $old = $_; -- cgit v1.2.3