diff options
| author | adam <adam@pkgsrc.org> | 2013-11-14 17:03:40 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-11-14 17:03:40 +0000 |
| commit | 016d7655463bdee07f6799b7c719565239323c6e (patch) | |
| tree | 1734aed9c73368e2171594303f14581690c46cf3 | |
| parent | 6ccd8a0ab7999634d85b671a0acc758df78fdc03 (diff) | |
| download | pkgsrc-016d7655463bdee07f6799b7c719565239323c6e.tar.gz | |
Added compatibility with Apache 2.4.x.
Fixed Clang issue when some symbols were truncated due to inlining.
| -rw-r--r-- | www/ap2-perl/Makefile | 22 | ||||
| -rw-r--r-- | www/ap2-perl/distinfo | 3 | ||||
| -rw-r--r-- | www/ap2-perl/patches/patch-src_modules_perl_modperl_common_util.h | 15 |
3 files changed, 34 insertions, 6 deletions
diff --git a/www/ap2-perl/Makefile b/www/ap2-perl/Makefile index 295faee9b3d..866bcde5d01 100644 --- a/www/ap2-perl/Makefile +++ b/www/ap2-perl/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.44 2013/06/04 13:48:40 adam Exp $ +# $NetBSD: Makefile,v 1.45 2013/11/14 17:03:40 adam Exp $ DISTNAME= mod_perl-2.0.8 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} +PKGREVISION= 1 CATEGORIES= www perl5 -MASTER_SITES= http://apache.org/dist/perl/ +MASTER_SITES= ${MASTER_SITE_APACHE:=perl/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://perl.apache.org/ @@ -12,12 +13,24 @@ LICENSE= apache-2.0 CONFLICTS= ap-perl-[0-9]* p5-Apache-Reload-[0-9]* p5-Apache-Test-[0-9]* -PKG_APACHE_ACCEPTED= apache2 apache22 - APACHE_MODULE= yes PERL5_PACKLIST= auto/mod_perl2/.packlist MAKE_PARAMS+= MP_APXS=${APXS} +MAKE_PARAMS+= MP_APR_CONFIG=${BUILDLINK_DIR}/bin/apr-config + +.include "../../mk/apache.mk" + +.if !empty(PKG_APACHE:Mapache24) +SUBST_CLASSES+= ap24 +SUBST_STAGE.ap24= pre-configure +SUBST_MESSAGE.ap24= Adding Apache 2.4.x compatibility. +SUBST_FILES.ap24= xs/maps/apache2_structures.map +SUBST_FILES.ap24+= xs/tables/current/Apache2/StructureTable.pm +SUBST_SED.ap24= -e "s,remote_addr,client_addr,g" +SUBST_SED.ap24+= -e "s,remote_ip,client_ip,g" +SUBST_SED.ap24+= -e "s,'loglevel','log.level',g" +.endif INSTALLATION_DIRS= ${PREFIX}/share/doc/mod_perl @@ -25,5 +38,4 @@ post-install: ${CP} -R ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/mod_perl .include "../../lang/perl5/module.mk" -.include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-perl/distinfo b/www/ap2-perl/distinfo index b1f1ae0b84a..cd3245bb74b 100644 --- a/www/ap2-perl/distinfo +++ b/www/ap2-perl/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.16 2013/06/04 13:48:40 adam Exp $ +$NetBSD: distinfo,v 1.17 2013/11/14 17:03:40 adam Exp $ SHA1 (mod_perl-2.0.8.tar.gz) = 165b1062f9680d1ccc92a88f1699797b6860c499 RMD160 (mod_perl-2.0.8.tar.gz) = 5863f229c1fe982852f05bf5c1af5d28dae28b7f Size (mod_perl-2.0.8.tar.gz) = 3790026 bytes +SHA1 (patch-src_modules_perl_modperl_common_util.h) = a5fd094351fef2994b67c6c70abc18c772aec532 diff --git a/www/ap2-perl/patches/patch-src_modules_perl_modperl_common_util.h b/www/ap2-perl/patches/patch-src_modules_perl_modperl_common_util.h new file mode 100644 index 00000000000..ccf01614f34 --- /dev/null +++ b/www/ap2-perl/patches/patch-src_modules_perl_modperl_common_util.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_modules_perl_modperl_common_util.h,v 1.1 2013/11/14 17:03:41 adam Exp $ + +Don't inline functions when compiling with Clang. Fixes missing symbols issues. + +--- src/modules/perl/modperl_common_util.h.orig 2013-11-14 16:46:44.000000000 +0000 ++++ src/modules/perl/modperl_common_util.h +@@ -19,7 +19,7 @@ + #ifndef MODPERL_COMMON_UTIL_H + #define MODPERL_COMMON_UTIL_H + +-#ifdef MP_DEBUG ++#if defined(MP_DEBUG) || defined(__clang__) + #define MP_INLINE + #else + #define MP_INLINE APR_INLINE |