From cb067bb4d86c24fe7224926227e6292c6b7db8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 5 Aug 2020 12:45:26 +0200 Subject: [PATCH] Fix SvUV_nomg() macro definition --- ...-5.33.0-sv.h-Wanted-UOK-but-said-IOK.patch | 31 +++++++++++++++++++ perl.spec | 6 ++++ 2 files changed, 37 insertions(+) create mode 100644 perl-5.33.0-sv.h-Wanted-UOK-but-said-IOK.patch diff --git a/perl-5.33.0-sv.h-Wanted-UOK-but-said-IOK.patch b/perl-5.33.0-sv.h-Wanted-UOK-but-said-IOK.patch new file mode 100644 index 0000000..759ed92 --- /dev/null +++ b/perl-5.33.0-sv.h-Wanted-UOK-but-said-IOK.patch @@ -0,0 +1,31 @@ +From 530e9296a21b673d7e4c2b42f18d0d52d00f35c4 Mon Sep 17 00:00:00 2001 +From: Karl Williamson +Date: Sun, 28 Jun 2020 12:03:54 -0600 +Subject: [PATCH] sv.h: Wanted UOK, but said IOK +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +I don't know the consequences of this bug + +Signed-off-by: Petr Písař +--- + sv.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sv.h b/sv.h +index 2f6431a826..3721b2fb1b 100644 +--- a/sv.h ++++ b/sv.h +@@ -1711,7 +1711,7 @@ Like C but doesn't process magic. + #define SvNV(sv) (SvNOK_nog(sv) ? SvNVX(sv) : sv_2nv(sv)) + + #define SvIV_nomg(sv) (SvIOK(sv) ? SvIVX(sv) : sv_2iv_flags(sv, 0)) +-#define SvUV_nomg(sv) (SvIOK(sv) ? SvUVX(sv) : sv_2uv_flags(sv, 0)) ++#define SvUV_nomg(sv) (SvUOK(sv) ? SvUVX(sv) : sv_2uv_flags(sv, 0)) + #define SvNV_nomg(sv) (SvNOK(sv) ? SvNVX(sv) : sv_2nv_flags(sv, 0)) + + /* ----*/ +-- +2.25.4 + diff --git a/perl.spec b/perl.spec index 7067a8f..39778f8 100644 --- a/perl.spec +++ b/perl.spec @@ -167,6 +167,9 @@ Patch13: perl-5.28.0-Pass-CFLAGS-to-dtrace.patch # Do not use a C compiler reserved identifiers, in upstream after 5.33.0 Patch14: perl-5.33.0-MUTABLE_PTR-Rmv-non-standard-syntax.patch +# Fix SvUV_nomg() macro definition, in upstream after 5.33.0 +Patch15: perl-5.33.0-sv.h-Wanted-UOK-but-said-IOK.patch + # Link XS modules to libperl.so with EU::CBuilder on Linux, bug #960048 Patch200: perl-5.16.3-Link-XS-modules-to-libperl.so-with-EU-CBuilder-on-Li.patch @@ -4167,6 +4170,7 @@ you're not running VMS, this module does nothing. %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %patch200 -p1 %patch201 -p1 @@ -4188,6 +4192,7 @@ perl -x patchlevel.h \ 'Fedora Patch12: Link XS modules to pthread library to fix linking with -z defs' \ 'Fedora Patch13: Pass the correct CFLAGS to dtrace' \ 'Fedora Patch14: Do not use a C compiler reserved identifiers' \ + 'Fedora Patch15: Fix SvUV_nomg() macro definition' \ 'Fedora Patch200: Link XS modules to libperl.so with EU::CBuilder on Linux' \ 'Fedora Patch201: Link XS modules to libperl.so with EU::MM on Linux' \ %{nil} @@ -6907,6 +6912,7 @@ popd %changelog * Wed Aug 05 2020 Petr Pisar - 4:5.32.0-459 - Do not use a C compiler reserved identifiers +- Fix SvUV_nomg() macro definition * Tue Jul 28 2020 Fedora Release Engineering - 4:5.32.0-458 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild