Backport PR #15 to fix prctl syscall detection on Fedora 32-bit ARM

f38
Adam Williamson 4 years ago
parent 4e75b0d4dd
commit e0b5370979

@ -0,0 +1,30 @@
From 153ab13dc9b99c1386b4d79d67582ccf2c21db8d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 24 Jun 2021 14:41:04 -0700
Subject: [PATCH] Match on 'armv7l' as well as 'arm' for prctl detection
...as this is what the uname call gives on Fedora's 32-bit ARM
builders, at least. Not matching it ultimately leads to the
os-autoinst test suite failing on 32-bit ARM package builds.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
lib/Mojo/IOLoop/ReadWriteProcess/Session.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Mojo/IOLoop/ReadWriteProcess/Session.pm b/lib/Mojo/IOLoop/ReadWriteProcess/Session.pm
index 05ac53d..7de168d 100644
--- a/lib/Mojo/IOLoop/ReadWriteProcess/Session.pm
+++ b/lib/Mojo/IOLoop/ReadWriteProcess/Session.pm
@@ -155,7 +155,7 @@ sub _get_prctl_syscall {
: ($machine eq "ppc" || $machine eq "ppc64le") ? 171
: $machine eq "ia64" ? 1170
: $machine eq "alpha" ? 348
- : $machine eq "arm" ? 0x900000 + 172
+ : ($machine eq "arm" || $machine eq "armv7l") ? 0x900000 + 172
: $machine eq "avr32" ? 148
: $machine eq "mips" ? 4000 + 192
: $machine eq "mips64" ? 5000 + 153
--
2.32.0

@ -1,11 +1,14 @@
Name: perl-Mojo-IOLoop-ReadWriteProcess Name: perl-Mojo-IOLoop-ReadWriteProcess
Version: 0.28 Version: 0.28
Release: 3%{?dist} Release: 4%{?dist}
Summary: Execute external programs or internal code blocks as separate process Summary: Execute external programs or internal code blocks as separate process
License: GPL+ or Artistic License: GPL+ or Artistic
URL: https://metacpan.org/release/Mojo-IOLoop-ReadWriteProcess/ URL: https://metacpan.org/release/Mojo-IOLoop-ReadWriteProcess/
Source0: https://cpan.metacpan.org/authors/id/S/SZ/SZARATE/Mojo-IOLoop-ReadWriteProcess-%{version}.tar.gz Source0: https://cpan.metacpan.org/authors/id/S/SZ/SZARATE/Mojo-IOLoop-ReadWriteProcess-%{version}.tar.gz
# https://github.com/mudler/Mojo-IOLoop-ReadWriteProcess/pull/15
# Fix prctl syscall detection on Fedora 32-bit ARM
Patch0: 0001-Match-on-armv7l-as-well-as-arm-for-prctl-detection.patch
BuildArch: noarch BuildArch: noarch
# Build requirements # Build requirements
@ -56,7 +59,7 @@ Mojo::IOLoop::ReadWriteProcess is yet another process manager.
It executes external programs or internal code blocks as separate process It executes external programs or internal code blocks as separate process
%prep %prep
%setup -q -n Mojo-IOLoop-ReadWriteProcess-%{version} %autosetup -p1 -n Mojo-IOLoop-ReadWriteProcess-%{version}
%build %build
/usr/bin/perl Build.PL --installdirs=vendor /usr/bin/perl Build.PL --installdirs=vendor
@ -76,6 +79,9 @@ It executes external programs or internal code blocks as separate process
%{_mandir}/man3/Mojo* %{_mandir}/man3/Mojo*
%changelog %changelog
* Thu Jun 24 2021 Adam Williamson <awilliam@redhat.com> - 0.28-4
- Backport PR #15 to fix prctl syscall detection on Fedora 32-bit ARM
* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 0.28-3 * Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 0.28-3
- Perl 5.34 rebuild - Perl 5.34 rebuild

Loading…
Cancel
Save