SOURCES: parigp-no-proccpuinfo.patch, perl-Math-Pari-crash-workaround.patch...

[hawk]

Author: hawk                         Date: Sat Mar 14 23:16:26 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for perl-Math-Pari-2.010801

---- Files affected:
SOURCES:
   parigp-no-proccpuinfo.patch (1.3 -> 1.4) , perl-Math-Pari-crash-workaround.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/parigp-no-proccpuinfo.patch
diff -u SOURCES/parigp-no-proccpuinfo.patch:1.3 SOURCES/parigp-no-proccpuinfo.patch:1.4
--- SOURCES/parigp-no-proccpuinfo.patch:1.3	Sat Oct 22 01:43:01 2005
+++ SOURCES/parigp-no-proccpuinfo.patch	Sun Mar 15 00:16:20 2009
@@ -20,14 +20,14 @@
  	    *SuperSparc*)   arch=sparcv8_super;;
  	    *TMS390Z5[05]*) arch=sparcv8_super;; # SuperSparc I or II
  	    *TMS390S1[05]*) arch=sparcv8_micro;; # MicroSparc I
---- pari-2.1.7/Math-Pari-2.010604/utils/Math/PariBuild.pm.orig	2005-01-20 03:04:46.000000000 +0100
-+++ pari-2.1.7/Math-Pari-2.010604/utils/Math/PariBuild.pm	2005-01-22 00:01:08.135658528 +0100
-@@ -712,7 +712,7 @@
-   } elsif ($os eq 'linux') {
+--- pari-2.1.7/Math-Pari-2.010801/utils/Math/PariBuild.pm.orig	2005-01-20 03:04:46.000000000 +0100
++++ pari-2.1.7/Math-Pari-2.010801/utils/Math/PariBuild.pm	2005-01-22 00:01:08.135658528 +0100
+@@ -801,7 +801,7 @@
      chomp($machine = `uname -m`);
      $machine = 'sparcv9' if $machine eq 'sparc64';
--    if (-e '/proc/cpuinfo') {
-+    if (0 && -e '/proc/cpuinfo') {
+     $machine = 'hppa' if $machine =~ /^parisc/;
+-    if ($machine eq 'sparc' and -e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
++    if ($machine eq 'sparc' and 0 && -e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
        open IN, '/proc/cpuinfo' or die "open /proc/cpuinfo: $!";
        local $/ = undef;		# Needed?
        my $info = <IN>;

================================================================
Index: SOURCES/perl-Math-Pari-crash-workaround.patch
diff -u SOURCES/perl-Math-Pari-crash-workaround.patch:1.3 SOURCES/perl-Math-Pari-crash-workaround.patch:1.4
--- SOURCES/perl-Math-Pari-crash-workaround.patch:1.3	Sat Oct 22 01:43:19 2005
+++ SOURCES/perl-Math-Pari-crash-workaround.patch	Sun Mar 15 00:16:21 2009
@@ -8,9 +8,9 @@
 where POINTER_VAL is just value of pointer to already existing Pari
 object (which may be destroyed later!).
 
---- pari-2.1.7/Math-Pari-2.010604/Pari.xs.orig	2004-01-31 10:06:08.000000000 +0100
-+++ pari-2.1.7/Math-Pari-2.010604/Pari.xs	2004-05-15 21:11:38.894463600 +0200
-@@ -986,6 +986,13 @@
+--- pari-2.1.7/Math-Pari-2.010801/Pari.xs.orig	2004-01-31 10:06:08.000000000 +0100
++++ pari-2.1.7/Math-Pari-2.010801/Pari.xs	2004-05-15 21:11:38.894463600 +0200
+@@ -1285,6 +1285,13 @@
    SV* nextsv;
    long ret=0;
    
@@ -23,17 +23,17 @@
 +  
    for (sv1 = PariStack; sv1 != sv; sv1 = nextsv) {
      ret++;
-     nextsv = (SV *) SvPVX(sv1);
-@@ -3336,7 +3343,7 @@
- 	 long oldavma = SvCUR(sv) + bot; /* The value of avma on the entry
+     SV_OAVMA_switch(nextsv, sv1, GENmovedOffStack); /* Mark as moved off stack. */
+@@ -3848,7 +3855,7 @@
+ 	 long oldavma;			 /* The value of avma on the entry
  					  * to function having the SV as
  					  * argument. */
 -	 long howmany;
 +	 long howmany = 0;
+ 	 SV_OAVMA_PARISTACK_get(sv, oldavma, ostack);
+ 	 oldavma += bot;
  #if 1
- 	 if (SvMAGICAL(sv) && SvTYPE(sv) == SVt_PVAV) {
- 	     MAGIC *mg = mg_find(sv, 'P');
-@@ -3364,6 +3371,7 @@
+@@ -3881,6 +3888,7 @@
  	     /* Now fall through: */
  /* case (IV)GENfirstOnStack: */
  	     /* Now sv is the newest one on stack. */
@@ -41,10 +41,10 @@
  	     onStack_dec;
  	     perlavma = oldavma;
  	     if (oldavma > sentinel) {
-@@ -3372,7 +3380,9 @@
+@@ -3889,7 +3897,9 @@
  		 avma = oldavma;	/* Mark the space on stack as free. */
  	     }
- 	     PariStack = (SV*)type; /* The same on the Perl/PARI side. */
+ 	     PariStack = (SV*)ostack; /* The same on the Perl/PARI side. */
 +	     }
  	 }
 +	 if (howmany >= 0)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/parigp-no-proccpuinfo.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/perl-Math-Pari-crash-workaround.patch?r1=1.3&r2=1.4&f=u