From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 26 Jun 2021 08:15:33 +0000 (+0200)
Subject: - rediffed target_arch and Math-Pari crash-workaround patches
X-Git-Tag: auto/th/parigp-2.11.4-19~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=354a576f7431ffa20dbe48a818053992706b1e45;p=packages%2Fparigp.git

- rediffed target_arch and Math-Pari crash-workaround patches
---

diff --git a/parigp-target_arch.patch b/parigp-target_arch.patch
index ac894c7..d2a0c95 100644
--- a/parigp-target_arch.patch
+++ b/parigp-target_arch.patch
@@ -12,14 +12,13 @@ diff -urNp -x '*.orig' pari-2.5.5.org/config/get_archos pari-2.5.5/config/get_ar
  if test "$fastread" != yes; then
    cat << EOM
  ==========================================================================
-diff -urNp -x '*.orig' pari-2.5.5.org/config/get_config_options pari-2.5.5/config/get_config_options
---- pari-2.5.5.org/config/get_config_options	2013-05-22 14:55:02.000000000 +0200
-+++ pari-2.5.5/config/get_config_options	2021-05-07 23:08:59.794747185 +0200
+--- pari-2.11.4/config/get_config_options.orig	2021-06-26 09:48:23.206303784 +0200
++++ pari-2.11.4/config/get_config_options	2021-06-26 09:50:09.378489327 +0200
 @@ -48,6 +48,7 @@ while test $# -gt 0; do
    --sysdatadir=*) dfltsysdatadir=`echo "$1" | sed -e 's/[-a-z]*=//'`;;
    --time=*) timing_fun=`echo "$1" | sed -e 's/[-a-z]*=//'`;;
    --host=*) target_host=`echo "$1" | sed -e 's/[-a-z]*=//'`;;
 +  --target=*) target_arch=`echo "$1" | sed -e 's/[-a-z]*=//'`;;
    --kernel=*) kernel=`echo "$1" | sed -e 's/[-a-z]*=//'`;;
+   --mt=*) thread_engine=`echo "$1" | sed -e 's/[-a-z]*=//'`;;
    --tune) tune=yes;;
-   --builddir) dfltobjdir=auto;;
diff --git a/perl-Math-Pari-crash-workaround.patch b/perl-Math-Pari-crash-workaround.patch
index 6e4d1b5..e0d507a 100644
--- a/perl-Math-Pari-crash-workaround.patch
+++ b/perl-Math-Pari-crash-workaround.patch
@@ -8,9 +8,9 @@ bless( do{\(my $o = POINTER_VAL)}, 'Math::Pari' );
 where POINTER_VAL is just value of pointer to already existing Pari
 object (which may be destroyed later!).
 
---- Math-Pari-2.01080605/Pari.xs.orig	2004-01-31 10:06:08.000000000 +0100
-+++ Math-Pari-2.01080605/Pari.xs	2004-05-15 21:11:38.894463600 +0200
-@@ -1285,6 +1285,13 @@
+--- Math-Pari-2.030518/Pari.xs.orig	2019-04-20 05:02:34.000000000 +0200
++++ Math-Pari-2.030518/Pari.xs	2021-06-26 09:51:04.478020090 +0200
+@@ -1377,6 +1377,13 @@ moveoffstack_newer_than(SV* sv)
    SV* nextsv;
    long ret=0;
    
@@ -24,16 +24,16 @@ object (which may be destroyed later!).
    for (sv1 = PariStack; sv1 != sv; sv1 = nextsv) {
      ret++;
      SV_OAVMA_switch(nextsv, sv1, GENmovedOffStack); /* Mark as moved off stack. */
-@@ -3848,7 +3855,7 @@
+@@ -4285,7 +4292,7 @@ DESTROY(rv)
  	 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;
+ 	 oldavma += myPARI_bot;
  #if 1
-@@ -3881,6 +3888,7 @@
+@@ -4318,6 +4325,7 @@ DESTROY(rv)
  	     /* Now fall through: */
  /* case (IV)GENfirstOnStack: */
  	     /* Now sv is the newest one on stack. */
@@ -41,7 +41,7 @@ object (which may be destroyed later!).
  	     onStack_dec;
  	     perlavma = oldavma;
  	     if (oldavma > sentinel) {
-@@ -3889,7 +3897,9 @@
+@@ -4326,7 +4334,9 @@ DESTROY(rv)
  		 avma = oldavma;	/* Mark the space on stack as free. */
  	     }
  	     PariStack = (SV*)ostack; /* The same on the Perl/PARI side. */