diff options
author | adam <adam@pkgsrc.org> | 2016-11-01 15:32:54 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2016-11-01 15:32:54 +0000 |
commit | 85bcd45c09d49e02c75ebc924c25af7cce436e55 (patch) | |
tree | 7e5a32234c44b98ce509d12d385cfceabf41b3f5 /www/ap2-perl | |
parent | df6510ede105b1bcf48465d619d2e217c7f2e88c (diff) | |
download | pkgsrc-85bcd45c09d49e02c75ebc924c25af7cce436e55.tar.gz |
Changes 2.0.10:
Declare MP_vtbl_env and MP_vtbl_envelem as 'extern' to fix linker errors on
OSX/Darwin.
Automatically select the appropriate c89 option when modperl is being
built with either gcc 5 or clang.
Fix non-threaded Perl 5.22.x build and tests.
Add support for Perl 5.22.x.
Diffstat (limited to 'www/ap2-perl')
-rw-r--r-- | www/ap2-perl/Makefile | 5 | ||||
-rw-r--r-- | www/ap2-perl/distinfo | 11 | ||||
-rw-r--r-- | www/ap2-perl/patches/patch-lib_Apache2_Build.pm | 48 |
3 files changed, 7 insertions, 57 deletions
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile index 297d69d596d..3cd9c2f1590 100644 --- a/www/ap2-perl/Makefile +++ b/www/ap2-perl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2016/07/09 06:39:10 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2016/11/01 15:32:54 adam Exp $ -DISTNAME= mod_perl-2.0.9 +DISTNAME= mod_perl-2.0.10 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} -PKGREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_APACHE:=perl/} diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo index b1c8e96cd67..8088aaad7ac 100644 --- a/www/ap2-perl/distinfo +++ b/www/ap2-perl/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.21 2016/08/04 14:18:15 nonaka Exp $ +$NetBSD: distinfo,v 1.22 2016/11/01 15:32:54 adam Exp $ -SHA1 (mod_perl-2.0.9.tar.gz) = 5de3018214da21de186d758a429d5c78f827caa5 -RMD160 (mod_perl-2.0.9.tar.gz) = f4be60f1b4f4b5645aa7e97ad09d6b1871611bd4 -SHA512 (mod_perl-2.0.9.tar.gz) = 421d385f0d5d04cbe8c1e9559960eea86a017fa1bed88e614009143550baf852e2345001faff1fb849d9b3e6383786e0011f45ebc3e7d26ad57651fbad4e2f2c -Size (mod_perl-2.0.9.tar.gz) = 3846584 bytes -SHA1 (patch-lib_Apache2_Build.pm) = b2dd179612272ff6facb0280c00d9589aa93dad6 +SHA1 (mod_perl-2.0.10.tar.gz) = 61b5b0fe4449440258ad45dee6efa0e2264a9701 +RMD160 (mod_perl-2.0.10.tar.gz) = 65fd0774bc495aa02af7dee249427f24d8a58b0e +SHA512 (mod_perl-2.0.10.tar.gz) = 0bf1a885cb32a3393e95f87e71983097613e263b9052dbf22494663b506e36a25d0256afed24285232276d9f43ebd3adaa18b91129bfb62116a8ccb023855bca +Size (mod_perl-2.0.10.tar.gz) = 3846211 bytes SHA1 (patch-src_modules_perl_modperl_common_util.h) = a5fd094351fef2994b67c6c70abc18c772aec532 diff --git a/www/ap2-perl/patches/patch-lib_Apache2_Build.pm b/www/ap2-perl/patches/patch-lib_Apache2_Build.pm deleted file mode 100644 index f1de4b75ee8..00000000000 --- a/www/ap2-perl/patches/patch-lib_Apache2_Build.pm +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-lib_Apache2_Build.pm,v 1.1 2016/08/04 14:18:15 nonaka Exp $ - -from mod_perl r1733566. - ------ -Automatic compiler flags for gcc 5 and clang - -To make compilation easier on gcc5/clang hosts, this patch automatically selects the appropriate c89 option, when modperl is being built with either gcc 5 or clang. - -Tested by the author on Ubuntu 15.10 (with gcc 5.2.1), Fedora 23 (with gcc 5.3.1) and FreeBSD 10.2 (with clang). - -Thanks to Klaus S. Madsen <ksm@jobindex.dk> for the patch. ------ - ---- lib/Apache2/Build.pm.orig 2015-06-19 05:13:53.000000000 +0900 -+++ lib/Apache2/Build.pm 2016-07-26 17:27:03.000000000 +0900 -@@ -611,6 +611,14 @@ sub ap_ccopts { - $ccopts .= " -DMP_TRACE"; - } - -+ if ($self->has_gcc_version('5.0.0') && $ccopts !~ /-fgnu89-inline/) { -+ $ccopts .= " -fgnu89-inline"; -+ } -+ -+ if ($self->has_clang && $ccopts !~ /-std=gnu89/) { -+ $ccopts .= " -std=gnu89"; -+ } -+ - # make sure apr.h can be safely included - # for example Perl's included -D_GNU_SOURCE implies - # -D_LARGEFILE64_SOURCE on linux, but this won't happen on -@@ -641,6 +649,16 @@ sub has_gcc_version { - return cmp_tuples(\@tuples, \@r_tuples) == 1; - } - -+sub has_clang { -+ my $self = shift; -+ -+ my $has_version = $self->perl_config('gccversion'); -+ -+ return 0 unless $has_version; -+ -+ return $has_version =~ m/Clang/; -+} -+ - sub cmp_tuples { - my ($num_a, $num_b) = @_; - |