Attached is a proposed NMU debdiff with an expanded comment in the patch. Will you take care of the upload, or should I upload it?
Michael
diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/changelog libmarpa-r2-perl-2.086000~dfsg/debian/changelog --- libmarpa-r2-perl-2.086000~dfsg/debian/changelog 2014-07-02 16:09:33.000000000 +0200 +++ libmarpa-r2-perl-2.086000~dfsg/debian/changelog 2014-11-22 17:24:24.000000000 +0100 @@ -1,3 +1,11 @@ +libmarpa-r2-perl (2.086000~dfsg-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/xs_boot_workaround.patch: New patch, fixes a bug on i386 + when loading Marpa::R2. Closes: #769265. + + -- Michael Banck <mba...@debian.org> Sat, 22 Nov 2014 16:32:00 +0100 + libmarpa-r2-perl (2.086000~dfsg-3) unstable; urgency=medium * Fix versioned build-dependency on libmodule-build-perl (add trailing diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/patches/series libmarpa-r2-perl-2.086000~dfsg/debian/patches/series --- libmarpa-r2-perl-2.086000~dfsg/debian/patches/series 2014-06-26 22:01:21.000000000 +0200 +++ libmarpa-r2-perl-2.086000~dfsg/debian/patches/series 2014-11-22 17:23:21.000000000 +0100 @@ -1 +1,2 @@ 2001_libmarpa_external_linkage.patch +xs_boot_workaround.patch diff -Nru libmarpa-r2-perl-2.086000~dfsg/debian/patches/xs_boot_workaround.patch libmarpa-r2-perl-2.086000~dfsg/debian/patches/xs_boot_workaround.patch --- libmarpa-r2-perl-2.086000~dfsg/debian/patches/xs_boot_workaround.patch 1970-01-01 01:00:00.000000000 +0100 +++ libmarpa-r2-perl-2.086000~dfsg/debian/patches/xs_boot_workaround.patch 2014-11-22 17:27:50.000000000 +0100 @@ -0,0 +1,24 @@ +Index: libmarpa-r2-perl-2.086000~dfsg/xs/R2.xs +=================================================================== +--- libmarpa-r2-perl-2.086000~dfsg.orig/xs/R2.xs ++++ libmarpa-r2-perl-2.086000~dfsg/xs/R2.xs +@@ -6428,6 +6428,19 @@ PPCODE: + INCLUDE: general_pattern.xsh + + BOOT: ++ /* XS generates this code for boot: ++ * ++ *|#if (PERL_REVISION == 5 && PERL_VERSION >= 9) ++ *| if (PL_unitcheckav) ++ *| call_list(PL_scopestack_ix, PL_unitcheckav); ++ *|#endif ++ * ++ * On i386 Debian, this results to a segfault, so Marpa::R2 ++ * cannot be loaded. Setting PERL_VERSION to 0 circumvents ++ * running call_list(). ++ */ ++#undef PERL_VERSION ++#define PERL_VERSION 0 + marpa_debug_handler_set(marpa_r2_warn); + + /* vim: set expandtab shiftwidth=2: */
