From 736eb8fd977fafaec18bd08aceb6cfd6e20d46cfd8f7ab9b3514c4ab27d367e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Mon, 25 Jul 2022 13:20:19 +0000 Subject: [PATCH] - fix build on ppc OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=225 --- perl.changes | 6 +++ perl.spec | 2 +- perl_skip_flaky_tests_powerpc.patch | 68 ++++++++++++----------------- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/perl.changes b/perl.changes index f314c54..9c18fad 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 25 15:18:20 CEST 2022 - mls@suse.de + +- fix build on ppc + * updated patch: perl_skip_flaky_tests_powerpc.patch + ------------------------------------------------------------------- Fri Jul 15 07:14:54 UTC 2022 - Adrian Schröter diff --git a/perl.spec b/perl.spec index f466374..ae2f933 100644 --- a/perl.spec +++ b/perl.spec @@ -184,7 +184,7 @@ cp -p %{SOURCE3} . %patch7 %ifarch ppc ppc64 ppc64le %patch8 -p1 -%patch13 -p1 +%patch13 %endif %patch9 -p1 %patch11 diff --git a/perl_skip_flaky_tests_powerpc.patch b/perl_skip_flaky_tests_powerpc.patch index aa62a79..eb6d960 100644 --- a/perl_skip_flaky_tests_powerpc.patch +++ b/perl_skip_flaky_tests_powerpc.patch @@ -1,6 +1,5 @@ -diff -ur perl-5.34.0/cpan/Memoize/t/expmod_t.t perl-5.34.0_fix/cpan/Memoize/t/expmod_t.t ---- perl-5.34.0/cpan/Memoize/t/expmod_t.t 2020-06-15 01:01:25.000000000 +0200 -+++ perl-5.34.0_fix/cpan/Memoize/t/expmod_t.t 2021-09-02 18:23:18.027586699 +0200 +--- cpan/Memoize/t/expmod_t.t.orig 2020-12-28 16:57:43.000000000 +0000 ++++ cpan/Memoize/t/expmod_t.t 2022-07-25 13:16:03.601927634 +0000 @@ -2,6 +2,7 @@ # test caching timeout @@ -9,9 +8,8 @@ diff -ur perl-5.34.0/cpan/Memoize/t/expmod_t.t perl-5.34.0_fix/cpan/Memoize/t/ex use lib '..'; use Memoize; -diff -ur perl-5.34.0/dist/Time-HiRes/t/alarm.t perl-5.34.0_fix/dist/Time-HiRes/t/alarm.t ---- perl-5.34.0/dist/Time-HiRes/t/alarm.t 2020-06-15 01:01:25.000000000 +0200 -+++ perl-5.34.0_fix/dist/Time-HiRes/t/alarm.t 2021-09-02 18:23:18.027586699 +0200 +--- dist/Time-HiRes/t/alarm.t.orig 2022-07-25 13:15:02.946034590 +0000 ++++ dist/Time-HiRes/t/alarm.t 2022-07-25 13:16:03.601927634 +0000 @@ -1,6 +1,6 @@ use strict; @@ -20,9 +18,8 @@ diff -ur perl-5.34.0/dist/Time-HiRes/t/alarm.t perl-5.34.0_fix/dist/Time-HiRes/t BEGIN { push @INC, '.' } use t::Watchdog; -diff -ur perl-5.34.0/dist/Time-HiRes/t/clock.t perl-5.34.0_fix/dist/Time-HiRes/t/clock.t ---- perl-5.34.0/dist/Time-HiRes/t/clock.t 2020-06-15 01:01:25.000000000 +0200 -+++ perl-5.34.0_fix/dist/Time-HiRes/t/clock.t 2021-09-02 18:23:18.027586699 +0200 +--- dist/Time-HiRes/t/clock.t.orig 2022-07-25 13:15:02.946034590 +0000 ++++ dist/Time-HiRes/t/clock.t 2022-07-25 13:16:03.601927634 +0000 @@ -1,6 +1,6 @@ use strict; @@ -31,10 +28,9 @@ diff -ur perl-5.34.0/dist/Time-HiRes/t/clock.t perl-5.34.0_fix/dist/Time-HiRes/t BEGIN { push @INC, '.' } use t::Watchdog; -diff -ur perl-5.34.0/dist/Time-HiRes/t/nanosleep.t perl-5.34.0_fix/dist/Time-HiRes/t/nanosleep.t ---- perl-5.34.0/dist/Time-HiRes/t/nanosleep.t 2020-06-15 01:01:25.000000000 +0200 -+++ perl-5.34.0_fix/dist/Time-HiRes/t/nanosleep.t 2021-09-02 18:23:18.027586699 +0200 -@@ -8,7 +8,7 @@ +--- dist/Time-HiRes/t/nanosleep.t.orig 2020-12-28 16:57:44.000000000 +0000 ++++ dist/Time-HiRes/t/nanosleep.t 2022-07-25 13:16:03.601927634 +0000 +@@ -8,7 +8,7 @@ BEGIN { } } @@ -43,10 +39,9 @@ diff -ur perl-5.34.0/dist/Time-HiRes/t/nanosleep.t perl-5.34.0_fix/dist/Time-HiR BEGIN { push @INC, '.' } use t::Watchdog; -diff -ur perl-5.34.0/dist/Time-HiRes/t/usleep.t perl-5.34.0_fix/dist/Time-HiRes/t/usleep.t ---- perl-5.34.0/dist/Time-HiRes/t/usleep.t 2020-06-15 01:01:25.000000000 +0200 -+++ perl-5.34.0_fix/dist/Time-HiRes/t/usleep.t 2021-09-02 18:23:18.027586699 +0200 -@@ -8,7 +8,7 @@ +--- dist/Time-HiRes/t/usleep.t.orig 2022-07-25 13:15:02.946034590 +0000 ++++ dist/Time-HiRes/t/usleep.t 2022-07-25 13:16:03.601927634 +0000 +@@ -8,7 +8,7 @@ BEGIN { } } @@ -55,10 +50,9 @@ diff -ur perl-5.34.0/dist/Time-HiRes/t/usleep.t perl-5.34.0_fix/dist/Time-HiRes/ BEGIN { push @INC, '.' } use t::Watchdog; -diff -ur perl-5.34.0/t/op/alarm.t perl-5.34.0_fix/t/op/alarm.t ---- perl-5.34.0/t/op/alarm.t 2020-06-15 01:01:25.000000000 +0200 -+++ perl-5.34.0_fix/t/op/alarm.t 2021-09-02 18:23:18.027586699 +0200 -@@ -11,6 +11,7 @@ +--- t/op/alarm.t.orig 2021-11-02 18:05:59.000000000 +0000 ++++ t/op/alarm.t 2022-07-25 13:16:03.601927634 +0000 +@@ -11,6 +11,7 @@ use Config; if ( !$Config{d_alarm} ) { skip_all("alarm() not implemented on this platform"); } @@ -66,10 +60,9 @@ diff -ur perl-5.34.0/t/op/alarm.t perl-5.34.0_fix/t/op/alarm.t plan tests => 5; my $Perl = which_perl(); -diff -ur perl-5.34.0/t/op/sigsystem.t perl-5.34.0_fix/t/op/sigsystem.t ---- perl-5.34.0/t/op/sigsystem.t 2020-06-15 01:01:25.000000000 +0200 -+++ perl-5.34.0_fix/t/op/sigsystem.t 2021-09-02 18:23:18.027586699 +0200 -@@ -11,6 +11,7 @@ +--- t/op/sigsystem.t.orig 2019-02-18 09:59:23.000000000 +0000 ++++ t/op/sigsystem.t 2022-07-25 13:16:03.601927634 +0000 +@@ -11,6 +11,7 @@ use strict; use constant TRUE => ($^X, '-e', 'exit 0'); use Data::Dumper; @@ -77,10 +70,9 @@ diff -ur perl-5.34.0/t/op/sigsystem.t perl-5.34.0_fix/t/op/sigsystem.t plan tests => 4; SKIP: { -diff -ur perl-5.34.0/t/op/sselect.t perl-5.34.0_fix/t/op/sselect.t ---- perl-5.34.0/t/op/sselect.t 2020-06-15 01:01:25.000000000 +0200 -+++ perl-5.34.0_fix/t/op/sselect.t 2021-09-02 18:23:18.027586699 +0200 -@@ -13,6 +13,8 @@ +--- t/op/sselect.t.orig 2019-02-18 09:59:23.000000000 +0000 ++++ t/op/sselect.t 2022-07-25 13:16:03.601927634 +0000 +@@ -13,6 +13,8 @@ BEGIN { skip_all("Win32 miniperl has no socket select") if $^O eq "MSWin32" && is_miniperl(); @@ -89,10 +81,9 @@ diff -ur perl-5.34.0/t/op/sselect.t perl-5.34.0_fix/t/op/sselect.t plan (16); my $blank = ""; -diff -ur perl-5.34.0/t/op/stat.t perl-5.34.0_fix/t/op/stat.t ---- perl-5.34.0/t/op/stat.t 2021-01-21 00:04:44.000000000 +0100 -+++ perl-5.34.0_fix/t/op/stat.t 2021-09-02 18:23:18.027586699 +0200 -@@ -9,6 +9,7 @@ +--- t/op/stat.t.orig 2021-11-02 18:05:59.000000000 +0000 ++++ t/op/stat.t 2022-07-25 13:16:03.601927634 +0000 +@@ -9,6 +9,7 @@ BEGIN { use strict; use warnings; use Config; @@ -100,15 +91,14 @@ diff -ur perl-5.34.0/t/op/stat.t perl-5.34.0_fix/t/op/stat.t my ($Null, $Curdir); if(eval {require File::Spec; 1}) { -diff -ur perl-5.34.0/t/porting/customized.dat perl-5.34.0_fix/t/porting/customized.dat ---- perl-5.34.0/t/porting/customized.dat 2021-05-20 18:38:19.000000000 +0200 -+++ perl-5.34.0_fix/t/porting/customized.dat 2021-09-02 18:24:44.556675449 +0200 -@@ -9,7 +9,7 @@ - Math::Complex cpan/Math-Complex/t/Trig.t 508f8e27373c08228be13ca5d42b28812ab0e020 +--- t/porting/customized.dat.orig 2022-07-25 13:15:02.942034598 +0000 ++++ t/porting/customized.dat 2022-07-25 13:17:23.473786794 +0000 +@@ -11,7 +11,7 @@ Math::Complex cpan/Math-Complex/t/Trig.t Math::Complex cpan/Math-Complex/t/underbar.t 97e7b9615658eefc67a710d4b258349cc5bace63 Memoize cpan/Memoize/Memoize.pm 902092ff91cdec9c7b4bd06202eb179e1ce26ca2 + Memoize cpan/Memoize/t/errors.t bcd0c02a4bc47dfda07a97d265d7210849871659 -Memoize cpan/Memoize/t/expmod_t.t a1c3d03fd3ec2e7c6c835f02316475756e1b16b7 +Memoize cpan/Memoize/t/expmod_t.t 72542117ab47558fca0eb0791df27312b5d84801 Memoize cpan/Memoize/t/speed.t 89fe8c8928f0164c9ed898b5a427dbbc814e9976 + Memoize cpan/Memoize/t/tie_gdbm.t d81c4f6208f6c925539b3878bff9a8ff1b73a37e Net::Ping dist/Net-Ping/t/000_load.t deff5dc2ca54dae28cb19d3631427db127279ac2 - Net::Ping dist/Net-Ping/t/001_new.t 7b24e05672e22edfe3e6b5cc0277f815efe557e5