Thu May 25 13:38:42 2017 UTC ()
Fix compiler flags for GCC 7 and newer on SunOS.


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

--- pkgsrc/www/apache24/Makefile 2017/04/30 01:22:02 1.56
+++ pkgsrc/www/apache24/Makefile 2017/05/25 13:38:42 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.56 2017/04/30 01:22:02 ryoon Exp $ 1# $NetBSD: Makefile,v 1.57 2017/05/25 13:38:42 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.25 8DISTNAME= httpd-2.4.25
9PKGNAME= ${DISTNAME:S/httpd/apache/} 9PKGNAME= ${DISTNAME:S/httpd/apache/}
10PKGREVISION= 3 10PKGREVISION= 3
11CATEGORIES= www 11CATEGORIES= www
12MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} 12MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/}
13MASTER_SITES+= http://archive.apache.org/dist/httpd/ 13MASTER_SITES+= http://archive.apache.org/dist/httpd/
14MASTER_SITES+= http://archive.eu.apache.org/dist/httpd/ 14MASTER_SITES+= http://archive.eu.apache.org/dist/httpd/
@@ -24,29 +24,35 @@ BUILD_DEFS+= VARBASE @@ -24,29 +24,35 @@ BUILD_DEFS+= VARBASE
24 24
25USE_LIBTOOL= yes 25USE_LIBTOOL= yes
26USE_TOOLS+= pax perl pkg-config 26USE_TOOLS+= pax perl pkg-config
27GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
28CONFIGURE_ARGS+= --enable-layout=NetBSD 28CONFIGURE_ARGS+= --enable-layout=NetBSD
29CONFIGURE_ARGS+= --enable-mods-shared=all 29CONFIGURE_ARGS+= --enable-mods-shared=all
30CONFIGURE_ARGS+= --enable-so 30CONFIGURE_ARGS+= --enable-so
31CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} 31CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr}
32CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util} 32CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
33CONFIGURE_ARGS+= --with-port=80 33CONFIGURE_ARGS+= --with-port=80
34CONFIGURE_ENV+= perlbin=${PERL5:Q} 34CONFIGURE_ENV+= perlbin=${PERL5:Q}
35CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent 35CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
36 36
37CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__ 37.include "../../mk/compiler.mk"
 38
 39CFLAGS.SunOS+= -D__EXTENSIONS__
 40.if !empty(CC_VERSION:Mgcc-[7-9]*)
 41CFLAGS.SunOS+= -D_XOPEN_SOURCE=600
 42.else
 43CFLAGS.SunOS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1
 44.endif
38 45
39.include "../../mk/bsd.prefs.mk" 
40BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0 46BUILDLINK_API_DEPENDS.apr+= apr>=1.5.0
41.include "../../devel/apr/buildlink3.mk" 47.include "../../devel/apr/buildlink3.mk"
42BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3 48BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.5.3
43.include "../../devel/apr-util/buildlink3.mk" 49.include "../../devel/apr-util/buildlink3.mk"
44.include "../../devel/pcre/buildlink3.mk" 50.include "../../devel/pcre/buildlink3.mk"
45.include "../../security/openssl/buildlink3.mk" 51.include "../../security/openssl/buildlink3.mk"
46.include "../../textproc/expat/buildlink3.mk" 52.include "../../textproc/expat/buildlink3.mk"
47.include "../../mk/dlopen.buildlink3.mk" 53.include "../../mk/dlopen.buildlink3.mk"
48.include "../../mk/pthread.buildlink3.mk" 54.include "../../mk/pthread.buildlink3.mk"
49 55
50CONFIGURE_ARGS+= --disable-xml2enc 56CONFIGURE_ARGS+= --disable-xml2enc
51CONFIGURE_ARGS+= --disable-proxy-html 57CONFIGURE_ARGS+= --disable-proxy-html
52CONFIGURE_ARGS+= --enable-proxy-fdpass 58CONFIGURE_ARGS+= --enable-proxy-fdpass