diff options
| author | shattered <shattered@pkgsrc.org> | 2012-09-23 12:46:15 +0000 |
|---|---|---|
| committer | shattered <shattered@pkgsrc.org> | 2012-09-23 12:46:15 +0000 |
| commit | f5f7409b08b4ab565fc370857571b49494e5e510 (patch) | |
| tree | 31111fe1bbdd657d5fb5de21b904ac2d91af2c28 /www | |
| parent | fff6231f2b723154b9c1aa67af9fd84384ef199a (diff) | |
| download | pkgsrc-f5f7409b08b4ab565fc370857571b49494e5e510.tar.gz | |
Add option 'nginx-autodetect-cflags' (not set by default) -- fixes build
problem on Solaris with Sun compiler (nginx ticket 65).
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx/Makefile | 3 | ||||
| -rw-r--r-- | www/nginx/Makefile.cflags | 8 | ||||
| -rw-r--r-- | www/nginx/options.mk | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 85f6dadeaa0..864ca2eb370 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/08/08 06:44:08 imil Exp $ +# $NetBSD: Makefile,v 1.26 2012/09/23 12:46:15 shattered Exp $ DISTNAME= nginx-1.2.3 CATEGORIES= www @@ -101,3 +101,4 @@ do-install: .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" +.include "Makefile.cflags" diff --git a/www/nginx/Makefile.cflags b/www/nginx/Makefile.cflags new file mode 100644 index 00000000000..9b1b89b325c --- /dev/null +++ b/www/nginx/Makefile.cflags @@ -0,0 +1,8 @@ +# $NetBSD: Makefile.cflags,v 1.1 2012/09/23 12:46:15 shattered Exp $ + +# This must be included after everything else to truly clear CFLAGS. +# If CFLAGS is non-empty, build with SunPro fails (bug 65). + +.if !empty(PKG_OPTIONS:Mnginx-autodetect-cflags) +CFLAGS= +.endif diff --git a/www/nginx/options.mk b/www/nginx/options.mk index e3515c243ee..9f3d9703f3b 100644 --- a/www/nginx/options.mk +++ b/www/nginx/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.16 2012/08/06 14:31:58 imil Exp $ +# $NetBSD: options.mk,v 1.17 2012/09/23 12:46:15 shattered Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nginx PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache naxsi pcre \ push realip ssl sub uwsgi image-filter upload debug \ - status + status nginx-autodetect-cflags PKG_SUGGESTED_OPTIONS= inet6 pcre ssl PLIST_VARS+= naxsi uwsgi |