[packages/perl] - added test-dst patch (fixes Time::Piece dst test with recent glibc TZ handling code)
qboosh
qboosh at pld-linux.org
Thu Nov 3 20:52:45 CET 2016
commit 02b3a98cccc24b25748a0f3b31f299249f4f9d7e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Nov 3 20:52:39 2016 +0100
- added test-dst patch (fixes Time::Piece dst test with recent glibc TZ handling code)
perl-test-dst.patch | 11 +++++++++++
perl.spec | 18 ++++++++++--------
2 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/perl.spec b/perl.spec
index 900c5bd..04956aa 100644
--- a/perl.spec
+++ b/perl.spec
@@ -93,6 +93,7 @@ Patch7: %{name}-t-syslog.patch
Patch8: %{name}-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch
Patch9: %{name}-switch.patch
Patch10: %{name}-invalid-void-use.patch
+Patch11: %{name}-test-dst.patch
URL: http://dev.perl.org/perl5/
%ifarch ppc
# gcc 3.3.x miscompiles pp_hot.c
@@ -708,6 +709,7 @@ z biblioteki GNU gdbm.
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
cat > runperl <<'EOF'
#!/bin/sh
@@ -723,8 +725,8 @@ chmod a+x runperl
# Disabling test for now but should also check if
# perl porting/checkcfgvar.pl --regen --default=undef
# makes better sense.
-rm t/porting/checkcfgvar.t
-sed -i -e '/^t\/porting\/checkcfgvar\.t.*/d' MANIFEST
+%{__rm} t/porting/checkcfgvar.t
+%{__sed} -i -e '/^t\/porting\/checkcfgvar\.t.*/d' MANIFEST
%build
unset LD_SYMBOLIC_FUNCTIONS || :
@@ -803,7 +805,7 @@ install -d $RPM_BUILD_ROOT%{perl_vendorlib}/Encode
## Fix lib
%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so
-mv $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so.%{abi} $RPM_BUILD_ROOT%{_libdir}
+%{__mv} $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so.%{abi} $RPM_BUILD_ROOT%{_libdir}
%{__ln_s} ../../../../libperl.so.%{abi} $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so.%{abi}
%{__ln_s} libperl.so.%{abi} $RPM_BUILD_ROOT%{_libdir}/libperl.so
# installed as non-executable - let rpm generate deps
@@ -876,14 +878,14 @@ owd=$(pwd)
## non-english man pages
%{__bzip2} -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perlcn.* $RPM_BUILD_ROOT%{_mandir}/zh_CN/man1
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perljp.* $RPM_BUILD_ROOT%{_mandir}/ja/man1
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perlko.* $RPM_BUILD_ROOT%{_mandir}/ko/man1
-mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perltw.* $RPM_BUILD_ROOT%{_mandir}/zh_TW/man1
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/perlcn.* $RPM_BUILD_ROOT%{_mandir}/zh_CN/man1
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/perljp.* $RPM_BUILD_ROOT%{_mandir}/ja/man1
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/perlko.* $RPM_BUILD_ROOT%{_mandir}/ko/man1
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/perltw.* $RPM_BUILD_ROOT%{_mandir}/zh_TW/man1
# `perl -MExtUtils::Embed -e ldopts` includes -Wl,--as-needed
# which is then forced upon anyone embedding perl.
-sed -i -e 's#^\(ld.*=.*\)-Wl,--as-needed\(.*\)#\1 \2#g' $RPM_BUILD_ROOT%{perl_archlib}/Config*.pl
+%{__sed} -i -e 's#^\(ld.*=.*\)-Wl,--as-needed\(.*\)#\1 \2#g' $RPM_BUILD_ROOT%{perl_archlib}/Config*.pl
%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.perl-non-english-man-pages
diff --git a/perl-test-dst.patch b/perl-test-dst.patch
new file mode 100644
index 0000000..375b949
--- /dev/null
+++ b/perl-test-dst.patch
@@ -0,0 +1,11 @@
+--- perl-5.24.0/cpan/Time-Piece/t/02core_dst.t.orig 2016-03-01 13:33:01.000000000 +0100
++++ perl-5.24.0/cpan/Time-Piece/t/02core_dst.t 2016-11-03 20:14:33.394601523 +0100
+@@ -127,7 +127,7 @@
+ SKIP: {
+ skip "Extra tests for Linux, BSD only.", 6 unless $is_linux or $is_mac or $is_bsd;
+
+- local $ENV{TZ} = "EST5EDT4";
++ local $ENV{TZ} = "EST5EDT4,M3.5.0,M10.5.0";
+ Time::Piece::_tzset();
+ my $lt = localtime(1373371631); #2013-07-09T12:07:11
+ cmp_ok(scalar($lt->tzoffset), 'eq', '-14400');
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/perl.git/commitdiff/02b3a98cccc24b25748a0f3b31f299249f4f9d7e
More information about the pld-cvs-commit
mailing list