[prev in list] [next in list] [prev in thread] [next in thread] 

List:       perl5-changes
Subject:    Change 35115: Integrate:
From:       Dave Mitchell <davem () iabyn ! com>
Date:       2008-12-15 23:00:03
Message-ID: 20081215230003.62A5D14025 () mx ! activestate ! com
[Download RAW message or body]

Change 35115 by davem@davem-pigeon on 2008/12/15 22:57:38

	Integrate:
	[ 34321]
	Cross-propagate changes between make_ext and make_ext_cross.
	Hopefully we can heal the code fork soon.

Affected files ...

... //depot/maint-5.10/perl/ext/util/make_ext#2 integrate
... //depot/maint-5.10/perl/ext/util/make_ext_cross#2 integrate

Differences ...

==== //depot/maint-5.10/perl/ext/util/make_ext#2 (text) ====
Index: perl/ext/util/make_ext
--- perl/ext/util/make_ext#1~32694~	2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/util/make_ext	2008-12-15 14:57:38.000000000 -0800
@@ -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/maint-5.10/perl/ext/util/make_ext_cross#2 (text) ====
Index: perl/ext/util/make_ext_cross
--- perl/ext/util/make_ext_cross#1~32694~	2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/util/make_ext_cross	2008-12-15 14:57:38.000000000 -0800
@@ -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.


[prev in list] [next in list] [prev in thread] [next in thread]