[SCM] Debian packaging of libdata-alias-perl branch, master, updated. 39842b85068a255d304059bf2c9f694bce6123fe

gregor herrmann gregoa at debian.org
Thu Nov 17 21:13:54 UTC 2011


The following commit has been merged in the master branch:
commit 987695eeb041b4fc934d2770f0cf9437f7619e99
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Nov 17 22:07:07 2011 +0100

    Add patch: 0001-Save-types-have-been-stored-in-UVs-on-the-save-stack.patch:
    adapt to changed storage of save types on the stack.
    
    Closes: #649058
    Thanks: Niko Tyni for the patch

diff --git a/debian/patches/0001-Save-types-have-been-stored-in-UVs-on-the-save-stack.patch b/debian/patches/0001-Save-types-have-been-stored-in-UVs-on-the-save-stack.patch
new file mode 100644
index 0000000..7b57d13
--- /dev/null
+++ b/debian/patches/0001-Save-types-have-been-stored-in-UVs-on-the-save-stack.patch
@@ -0,0 +1,47 @@
+From 5886d259b3fa9c738696a37e0c302218af4805fe Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Thu, 17 Nov 2011 20:25:46 +0000
+Subject: [PATCH] Save types have been stored in UVs on the save stack since
+ 5.13.1
+
+Upstream change c6bf6a65e4bf512beae58d59446 changed storage of
+save types on the stack from INT32s to UVs, so adapt accordingly.
+
+This probably only bites on big endian architectures with -Duse64bitint,
+where the UVs are bigger and the first byte doesn't contain the save
+type anymore.
+---
+ Alias.xs |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/Alias.xs b/Alias.xs
+index e3c9f76..28e2ed4 100644
+--- a/Alias.xs
++++ b/Alias.xs
+@@ -371,7 +371,11 @@ STATIC void da_alias(pTHX_ SV *a1, SV *a2, SV *value) {
+ 				SSPUSHDXPTR((void (*)(pTHX_ void *))
+ 					da_restore_gvcv);
+ 				SSPUSHPTR(SvREFCNT_inc_simple_NN((SV *) gv));
++#if (PERL_COMBI_VERSION >= 5013001)
++				SSPUSHUV(SAVEt_DESTRUCTOR_X);
++#else
+ 				SSPUSHINT(SAVEt_DESTRUCTOR_X);
++#endif
+ 				GvCV_set(gv,
+ 					(CV *) SvREFCNT_inc_simple_NN(value));
+ 			} else {
+@@ -447,7 +451,11 @@ STATIC void da_localize_gvar(pTHX_ GP *gp, SV **sptr) {
+ 	SSPUSHPTR(*sptr);
+ 	SSPUSHDXPTR((void (*)(pTHX_ void *)) da_unlocalize_gvar);
+ 	SSPUSHPTR(gp);
++#if (PERL_COMBI_VERSION >= 5013001)
++	SSPUSHUV(SAVEt_DESTRUCTOR_X);
++#else
+ 	SSPUSHINT(SAVEt_DESTRUCTOR_X);
++#endif
+ 	++gp->gp_refcnt;
+ 	*sptr = Nullsv;
+ }
+-- 
+1.7.7.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..48e35a9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Save-types-have-been-stored-in-UVs-on-the-save-stack.patch

-- 
Debian packaging of libdata-alias-perl



More information about the Pkg-perl-cvs-commits mailing list