In metaconfig.git, the branch master has been updated <http://perl5.git.perl.org/metaconfig.git/commitdiff/136d9404151a64b01788a29e7dee7f66925d1b2c?hp=1d3f5f6eafa4f3c8eb679d3ed12a44b9696a2751>
- Log ----------------------------------------------------------------- commit 136d9404151a64b01788a29e7dee7f66925d1b2c Author: H.Merijn Brand <[email protected]> Date: Thu Sep 24 12:26:00 2009 +0200 Backport of dd6c21bebf897e04754ff0d50210c6e54cc753c7 Search for extensions in cpan/ as well as ext/ This required inverting the logic of test for "are we flattened or not". Currently we can only build XS extensions on Unix from cpan/ ----------------------------------------------------------------------- Summary of changes: U/perl/Extensions.U | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/U/perl/Extensions.U b/U/perl/Extensions.U index 33e00d3..258c367 100644 --- a/U/perl/Extensions.U +++ b/U/perl/Extensions.U @@ -84,19 +84,7 @@ find_extensions=' *) this_ext=`echo $xxx | $sed -e s/-/\\\//g`; leaf=`echo $xxx | $sed -e s/.*-//`; - if $test -d File-Glob; then - $ls -1 $xxx > $$.tmp; - if $contains "\.xs$" $$.tmp > /dev/null 2>&1; then - known_extensions="$known_extensions $this_ext"; - elif $contains "\.c$" $$.tmp > /dev/null 2>&1; then - known_extensions="$known_extensions $this_ext"; - elif $test "$this_ext" = "IO/Compress"; then - known_extensions="$known_extensions $this_ext"; - elif $test -d $xxx; then - nonxs_extensions="$nonxs_extensions $this_ext"; - fi; - $rm -f $$.tmp; - else + if $test -d File; then if $test -f $xxx/$leaf.xs -o -f $xxx/$leaf.c; then known_extensions="$known_extensions $1$this_ext"; elif $test -f $xxx/Makefile.PL; then @@ -110,11 +98,27 @@ find_extensions=' shift; fi; fi; + else + $ls -1 $xxx > $$.tmp; + if $contains "\.xs$" $$.tmp > /dev/null 2>&1; then + known_extensions="$known_extensions $this_ext"; + elif $contains "\.c$" $$.tmp > /dev/null 2>&1; then + known_extensions="$known_extensions $this_ext"; + elif $test "$this_ext" = "IO/Compress"; then + known_extensions="$known_extensions $this_ext"; + elif $test -d $xxx; then + nonxs_extensions="$nonxs_extensions $this_ext"; + fi; + $rm -f $$.tmp; fi ;; esac; done' tdir=`pwd` +cd "$rsrc/cpan" +set X +shift +eval $find_extensions cd "$rsrc/ext" set X shift -- perl5 metaconfig repository
