Tue Sep 28 13:01:37 2021 UTC ()
apache24: Support GCC >= 10.


(jperkin)
diff -r1.101 -r1.102 pkgsrc/www/apache24/Makefile
cvs diff -r1.101 -r1.102 pkgsrc/www/apache24/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache24/Makefile 2021/09/17 12:49:57 1.101
+++ pkgsrc/www/apache24/Makefile 2021/09/28 13:01:37 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.101 2021/09/17 12:49:57 adam Exp $ 1# $NetBSD: Makefile,v 1.102 2021/09/28 13:01:37 jperkin Exp $
2# 2#
3# When updating this package, make sure that no strings like 3# When updating this package, make sure that no strings like
4# "PR 12345" are in the commit message. Upstream likes 4# "PR 12345" are in the commit message. Upstream likes
5# to reference their own PRs this way, but this ends up 5# to reference their own PRs this way, but this ends up
6# in NetBSD GNATS. 6# in NetBSD GNATS.
7 7
8DISTNAME= httpd-2.4.49 8DISTNAME= httpd-2.4.49
9PKGNAME= ${DISTNAME:S/httpd/apache/} 9PKGNAME= ${DISTNAME:S/httpd/apache/}
10CATEGORIES= www 10CATEGORIES= www
11MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} 11MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/}
12MASTER_SITES+= https://archive.apache.org/dist/httpd/ 12MASTER_SITES+= https://archive.apache.org/dist/httpd/
13EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
14 14
@@ -25,27 +25,27 @@ USE_TOOLS+= pax perl pkg-config @@ -25,27 +25,27 @@ USE_TOOLS+= pax perl pkg-config
25GNU_CONFIGURE= yes 25GNU_CONFIGURE= yes
26CONFIGURE_ARGS+= --enable-layout=NetBSD 26CONFIGURE_ARGS+= --enable-layout=NetBSD
27CONFIGURE_ARGS+= --enable-mods-shared=all 27CONFIGURE_ARGS+= --enable-mods-shared=all
28CONFIGURE_ARGS+= --enable-so 28CONFIGURE_ARGS+= --enable-so
29CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} 29CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
30CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util} 30CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
31CONFIGURE_ARGS+= --with-port=80 31CONFIGURE_ARGS+= --with-port=80
32CONFIGURE_ENV+= perlbin=${PERL5:Q} 32CONFIGURE_ENV+= perlbin=${PERL5:Q}
33CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent 33CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
34 34
35.include "../../mk/compiler.mk" 35.include "../../mk/compiler.mk"
36 36
37CFLAGS.SunOS+= -D__EXTENSIONS__ 37CFLAGS.SunOS+= -D__EXTENSIONS__
38.if !empty(CC_VERSION:Mgcc-[5-9]*) || !empty(PKGSRC_COMPILER:Mclang) 38.if !empty(CC_VERSION:Mgcc-[5-9]*) || !empty(CC_VERSION:Mgcc-1[0-9].*) || !empty(PKGSRC_COMPILER:Mclang)
39CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 39CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
40.else 40.else
41CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 41CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
42.endif 42.endif
43 43
44BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0 44BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0
45.include "../../devel/apr/buildlink3.mk" 45.include "../../devel/apr/buildlink3.mk"
46BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3 46BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3
47.include "../../devel/apr-util/buildlink3.mk" 47.include "../../devel/apr-util/buildlink3.mk"
48.include "../../devel/pcre/buildlink3.mk" 48.include "../../devel/pcre/buildlink3.mk"
49.include "../../security/openssl/buildlink3.mk" 49.include "../../security/openssl/buildlink3.mk"
50.include "../../textproc/expat/buildlink3.mk" 50.include "../../textproc/expat/buildlink3.mk"
51.include "../../mk/dlopen.buildlink3.mk" 51.include "../../mk/dlopen.buildlink3.mk"