[libmath-bigint-gmp-perl] 03/04: drop preliminary 32bit.patch which was applied upstream
gregor herrmann
gregoa at debian.org
Mon Dec 14 20:52:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libmath-bigint-gmp-perl.
commit 7279f7e7ba75c3993c55ffc21e1eda7c6e6afc9a
Author: gregor herrmann <gregoa at debian.org>
Date: Mon Dec 14 21:47:16 2015 +0100
drop preliminary 32bit.patch which was applied upstream
Gbp-Dch: Ignore
---
debian/changelog | 4 ----
debian/patches/32bit.patch | 32 --------------------------------
debian/patches/series | 1 -
3 files changed, 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8269ecb..c8a6af3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
libmath-bigint-gmp-perl (1.47-1) UNRELEASED; urgency=medium
- * Add patch to fix breakage on 32 bit platforms where perl is compiled
- with 64 bit support.
- Patch taken from proposed fix in CPAN RT#103517.
- (Closes: #807492)
* New upstream release.
Fixes "FTBFS on 32 bit platforms".
(Closes: #807492)
diff --git a/debian/patches/32bit.patch b/debian/patches/32bit.patch
deleted file mode 100644
index 9c73029..0000000
--- a/debian/patches/32bit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: fix breakage on 32 bit platforms where perl is compiled with 64 bit support
-Origin: CPAN RT#103517
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=103517
-Bug-Debian: https://bugs.debian.org/807492
-Author: Dana A Jacobsen <danaj at cpan.org>
-Last-Update: 2015-12-13
-
---- a/GMP.xs
-+++ b/GMP.xs
-@@ -167,9 +167,9 @@
- CODE:
- NEW_GMP_MPZ_T;
- /* using the IV directly is a bit faster */
-- if (SvUOK(x) || SvIOK(x))
-+ if ((SvUOK(x) || SvIOK(x)) && (sizeof(UV) <= sizeof(unsigned long) || SvUV(x) == (unsigned long)SvUV(x)))
- {
-- mpz_init_set_ui(*RETVAL, (UV)SvUV(x));
-+ mpz_init_set_ui(*RETVAL, (unsigned long)SvUV(x));
- }
- else
- {
-@@ -189,8 +189,8 @@
- mpz_t *mpz;
- CODE:
- mpz = malloc (sizeof(mpz_t));
-- if (SvUOK(x) || SvIOK(x)) {
-- mpz_init_set_ui(*mpz, (UV)SvUV(x));
-+ if ((SvUOK(x) || SvIOK(x)) && (sizeof(UV) <= sizeof(unsigned long) || SvUV(x) == (unsigned long)SvUV(x))) {
-+ mpz_init_set_ui(*mpz, (unsigned long)SvUV(x));
- }
- else {
- mpz_init_set_str(*mpz, SvPV_nolen(x), 10);
diff --git a/debian/patches/series b/debian/patches/series
index 4f80d18..8dccbc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
fix-checklib-fail.patch
-32bit.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmath-bigint-gmp-perl.git
More information about the Pkg-perl-cvs-commits
mailing list