In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/57ad57e0c240e6f9b1b9e73de8068a9bc11b5466?hp=914d9b2e2d3693a8dcc1cd21e5c25efc641f76b6>
- Log ----------------------------------------------------------------- commit 57ad57e0c240e6f9b1b9e73de8068a9bc11b5466 Author: Nicholas Clark <[email protected]> Date: Fri Sep 25 20:48:35 2009 +0100 win32/FindExt.pm's regression test needs to scan cpan/ as well as ext/ M win32/FindExt.t commit 4d33dfde6c2d9f2fd0a0031d2360c4dbbbcd6b33 Author: Nicholas Clark <[email protected]> Date: Fri Sep 25 20:46:36 2009 +0100 Don't process (apparent) duplicate extension directories. (Another work-around for smokers that are not clearing directories. Without this vestigial directories in ext/ are treated as nonxs extensions, and as ext/ is scanned after cpan/, that classification overrides the truth.) M win32/FindExt.pm ----------------------------------------------------------------------- Summary of changes: win32/FindExt.pm | 3 +++ win32/FindExt.t | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/win32/FindExt.pm b/win32/FindExt.pm index 3f12a23..fe1febd 100644 --- a/win32/FindExt.pm +++ b/win32/FindExt.pm @@ -88,6 +88,9 @@ sub find_ext $this_ext =~ s!-!/!g; $leaf =~ s/.*-//; + # Temporary hack to cope with smokers that are not clearing directories: + next if $ext{$this_ext}; + if (has_xs_or_c("$ext_dir$item")) { $ext{$this_ext} = $static{$this_ext} ? 'static' : 'dynamic'; } else { diff --git a/win32/FindExt.t b/win32/FindExt.t index cb4de81..d521fa9 100644 --- a/win32/FindExt.t +++ b/win32/FindExt.t @@ -9,6 +9,7 @@ use Test::More tests => 10; use FindExt; use Config; +FindExt::scan_ext('../cpan'); FindExt::scan_ext('../ext'); # Config.pm and FindExt.pm make different choices about what should be built -- Perl5 Master Repository
