Change 34321: Cross-propagate changes between make_ext and make_ext_cross.

[Nicholas Clark]

Change 34321 by [EMAIL PROTECTED] on 2008/09/08 20:16:02

        Cross-propagate changes between make_ext and make_ext_cross.
        Hopefully we can heal the code fork soon.

Affected files ...

... //depot/perl/ext/util/make_ext#21 edit
... //depot/perl/ext/util/make_ext_cross#2 edit

Differences ...

==== //depot/perl/ext/util/make_ext#21 (text) ====
Index: perl/ext/util/make_ext
--- perl/ext/util/make_ext#20~31878~    2007-09-17 03:07:29.000000000 -0700
+++ perl/ext/util/make_ext      2008-09-08 13:16:02.000000000 -0700
@@ -65,7 +65,7 @@
        pname=`echo "$extspec" | sed -e 's:^ext/::' -e 's:/pm_to_blib$::' ` ;;
 *::*)  # Convert :: to /
        pname=`echo "$extspec" | sed -e 's/::/\//g' ` ;;
-*.o)    pname=`echo "$extspec" | sed -e 's/\.o//'` ;;
+*.*o)    pname=`echo "$extspec" | sed -e 's/\..*o//'` ;;
 *)     pname="$extspec" ;;
 esac
 # echo "Converted $extspec to $pname"

==== //depot/perl/ext/util/make_ext_cross#2 (text) ====
Index: perl/ext/util/make_ext_cross
--- perl/ext/util/make_ext_cross#1~31287~       2007-05-28 05:03:25.000000000 
-0700
+++ perl/ext/util/make_ext_cross        2008-09-08 13:16:02.000000000 -0700
@@ -82,6 +82,12 @@
     exit 0 # not an error ?
 fi
 
+case "$osname" in
+catamount) # Snowball's chance of building extensions.
+  echo "This is $osname, not building $mname, sorry."
+  exit 0
+  ;;
+esac
 
 echo " Making $mname ($target)"
 
@@ -121,7 +127,7 @@
 esac
 
 if test ! -f $makefile ; then
-       test -f Makefile.PL && ../$depth/miniperl -I../$depth/lib -MCross 
Makefile.PL INSTALLDIRS=perl PERL_CORE=1 $passthru
+       test -f Makefile.PL && $run ../$depth/miniperl -I../$depth/lib -MCross 
Makefile.PL INSTALLDIRS=perl INSTALLMAN3DIR=none PERL_CORE=1 $passthru
 fi
 if test ! -f $makefile ; then
        echo "Warning: No Makefile!"
End of Patch.