summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormattsday2020-09-16 09:23:16 +0100
committermattsday2020-09-16 09:23:16 +0100
commit9eb2df0e7f7fb582c217db65b0de8864f3b62f6c (patch)
treea08160bbf7cda9ae08c5e60c47f7cc3ddee28eb8
parentfc6ceebd9316cb0d10fc9faf352c5139ffa52281 (diff)
downloadaur-9eb2df0e7f7fb582c217db65b0de8864f3b62f6c.tar.gz
Added additional workarounds for failing tests
Taken from mod_perl mailing list and should resolve installations broken by failing tests/checks: http://mail-archives.apache.org/mod_mbox/perl-modperl/202009.mbox/%3C8d69b2e8-4a4e-bde4-6eff-7018ddf6354e%40gmail.com%3E
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD10
2 files changed, 10 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f1cfe345cf2..9ef31b527ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mod_perl
pkgdesc = Apache module that embeds the Perl interpreter within the server
pkgver = 2.0.11
- pkgrel = 2
+ pkgrel = 3
url = http://perl.apache.org/
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 0f63024cfe6..b2c1a9d1ba2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=mod_perl
pkgver=2.0.11
-pkgrel=2
+pkgrel=3
pkgdesc='Apache module that embeds the Perl interpreter within the server'
arch=(i686 x86_64 armv6h armv7h)
url='http://perl.apache.org/'
@@ -18,6 +18,14 @@ validpgpkeys=(2026E6A4A6A4483E61BA6F3FAB34BA0040E92ECE)
sha256sums=('ca2a9e18cdf90f9c6023e786369d5ba75e8dac292ebfea9900c29bf42dc16f74'
'SKIP')
+prepare() {
+ cd mod_perl-$pkgver
+ # Workaround per http://mail-archives.apache.org/mod_mbox/perl-modperl/202009.mbox/%3C8d69b2e8-4a4e-bde4-6eff-7018ddf6354e%40gmail.com%3E
+ sed -i -e '1098,1102d' Apache-Test/lib/Apache/TestRun.pm
+ sed -i '51,56c push @INC, "xs/tables/current24";' lib/ModPerl/MapUtil.pm
+ sed -i -e '66d' src/modules/perl/modperl_sys.c
+}
+
build() {
cd mod_perl-$pkgver
perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/bin/apxs