From 3f6552d773436e12a2e67cf634fb718c64070ce88b0456249317456ac117f90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Mon, 7 Mar 2022 09:42:13 +0000
Subject: [PATCH] Accepting request 959807 from home:Andreas_Schwab:Factory

- Don't install anything in testsuite build
- Run testsuite also in qemu build
- posix-sigaction.patch: remove, this has been fixed properly in commit
  19c9c2ee4a

OBS-URL: https://build.opensuse.org/request/show/959807
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=210
---
 perl.changes          |  8 ++++++++
 perl.spec             | 12 ++++++++----
 posix-sigaction.patch | 13 -------------
 3 files changed, 16 insertions(+), 17 deletions(-)
 delete mode 100644 posix-sigaction.patch

diff --git a/perl.changes b/perl.changes
index 90981f6..f748ea1 100644
--- a/perl.changes
+++ b/perl.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar  3 13:33:03 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- Don't install anything in testsuite build
+- Run testsuite also in qemu build
+- posix-sigaction.patch: remove, this has been fixed properly in commit
+  19c9c2ee4a
+
 -------------------------------------------------------------------
 Mon Oct  4 08:08:30 UTC 2021 - Stephan Kulow <coolo@suse.com>
 
diff --git a/perl.spec b/perl.spec
index 5ffdd7f..d37292c 100644
--- a/perl.spec
+++ b/perl.spec
@@ -50,7 +50,6 @@ Patch11:        perl-5.18.2-overflow.diff
 Patch12:        perl-reproducible.patch
 # PATCH-FIX-OPENSUSE skip flaky tests powerpc as bypass https://bugzilla.suse.com/show_bug.cgi?id=1063176
 Patch13:        perl_skip_flaky_tests_powerpc.patch
-Patch14:        posix-sigaction.patch
 # PATCH-FIX-UPSTREAM https://github.com/Perl/perl5/pull/18919 - Fix build with gdbm 1.20
 Patch15:        https://github.com/Perl/perl5/commit/c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch
 # PATCH-FIX-UPSTREAM unmerged https://www.nntp.perl.org/group/perl.perl5.porters/2018/12/msg253240.html
@@ -187,7 +186,6 @@ cp -p %{SOURCE3} .
 %patch9 -p1
 %patch11
 %patch12 -p1
-%patch14
 %patch15 -p1
 %patch18
 
@@ -230,12 +228,17 @@ mv savelib lib
 make %{?_smp_mflags}
 
 %check
-%if "%{name}" == "perl-testsuite" && !0%{?qemu_user_space_build}
-%define _unpackaged_files_terminate_build 0
+%if 0%{?qemu_user_space_build}
+# Disable tests that are difficult to emulate
+echo 'print "1..0\n";' > t/op/fork.t
+echo 'print "1..0\n";' > t/op/magic.t
+%endif
+%if "%{name}" == "perl-testsuite"
 TEST_JOBS="%{jobs}" make %{?_smp_mflags} test
 %endif
 
 %install
+%if "%{name}" != "perl-testsuite"
 %make_install
 cp -a %{buildroot}/usr/lib/perl5/site_perl %{buildroot}/usr/lib/perl5/vendor_perl
 cpa=`echo %{buildroot}/usr/lib/perl5/*/*/CORE | sed -e 's@/CORE$@@'`
@@ -352,6 +355,7 @@ EOF
      esac
    done)
 } > perl-base-excludes
+%endif
 
 %if "%{name}" == "perl"
 %files base -f perl-base-filelist
diff --git a/posix-sigaction.patch b/posix-sigaction.patch
deleted file mode 100644
index 2b38415..0000000
--- a/posix-sigaction.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./ext/POSIX/POSIX.xs.orig	2020-06-14 23:01:25.000000000 +0000
-+++ ./ext/POSIX/POSIX.xs	2020-10-27 10:53:50.744531872 +0000
-@@ -3110,6 +3110,10 @@ sigaction(sig, optaction, oldaction = 0)
- 		/* Set up any desired flags. */
- 		svp = hv_fetchs(action, "FLAGS", FALSE);
- 		act.sa_flags = svp ? SvIV(*svp) : 0;
-+#ifdef SA_SIGINFO
-+		/* Perl_sighandler depends on the extra arguments. */
-+		act.sa_flags |= SA_SIGINFO;
-+#endif
- 
- 		/* Safe signals use "csighandler", which vectors through the
- 		   PL_sighandlerp pointer when it's safe to do so.