Allow building against perl <= 5.25.5

This commit is contained in:
Petr Písař 2017-05-11 13:35:30 +02:00
parent daf015956e
commit 055e46cb03
2 changed files with 38 additions and 2 deletions

View File

@ -0,0 +1,34 @@
From ccf6bcc1ea08403f9081ce608009322e1b5091f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 11 May 2017 13:29:57 +0200
Subject: [PATCH] Provide SvPVCLEAR() macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
To build with perl <= 5.25.5.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
Storable.xs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Storable.xs b/Storable.xs
index 9ba48be..f7d253c 100644
--- a/Storable.xs
+++ b/Storable.xs
@@ -26,6 +26,11 @@
#include "ppport.h" /* handle old perls */
#endif
+/* SvPVCLEAR was added after 5.25.5 and ppport.h does not provide it */
+#if !defined SvPVCLEAR
+#define SvPVCLEAR(x) sv_setpvs((x), "")
+#endif
+
#if 0
#define DEBUGME /* Debug mode, turns assertions on as well */
#define DASSERT /* Assertion mode */
--
2.9.3

View File

@ -14,14 +14,15 @@ Patch0: Storable-2.51-Upgrade-to-2.53.patch
Patch1: Storable-2.53-Upgrade-to-2.56.patch
# Unbundled from perl 5.25.12, requires SvPVCLEAR() added into perl after 5.25.5
Patch2: Storable-2.56-Upgrade-to-2.62.patch
# Allow building against perl <= 5.25.5,
# required for Storable-2.56-Upgrade-to-2.62.patch
Patch3: Storable-2.62-Provide-SvPVCLEAR-macro.patch
BuildRequires: coreutils
BuildRequires: gcc
BuildRequires: make
BuildRequires: perl
BuildRequires: perl-devel
BuildRequires: perl-generators
# For SvPVCLEAR()
BuildRequires: perl(:VERSION) > 5.25.5
BuildRequires: perl(Config)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: sed
@ -74,6 +75,7 @@ can be conveniently stored to disk and retrieved at a later time.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# Remove bundled modules
rm -rf t/compat
sed -i -e '/^t\/compat\//d' MANIFEST