svn commit: r438891 - in head/net: haproxy haproxy-devel haproxy-devel/files haproxy/files

[Dmitry Sivachenko]

Author: demon
Date: Wed Apr 19 16:30:09 2017
New Revision: 438891
URL: https://svnweb.freebsd.org/changeset/ports/438891

Log:
  Overriding OPTIONS_CFLAGS was a bad idea.
  backout last commit and use CFLAGS as before.

Deleted:
  head/net/haproxy-devel/files/patch-Makefile
  head/net/haproxy/files/patch-Makefile
Modified:
  head/net/haproxy-devel/Makefile
  head/net/haproxy/Makefile

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Wed Apr 19 16:21:33 2017	(r438890)
+++ head/net/haproxy-devel/Makefile	Wed Apr 19 16:30:09 2017	(r438891)
@@ -24,7 +24,8 @@ DEVICEATLAS_DISTFILE=	deviceatlas-enterp
 DEVICEATLAS_REGISTRATION_URL=	https://deviceatlas.com/deviceatlas-haproxy-module
 
 MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
-		USE_ZLIB=1 USE_CPU_AFFINITY=1 CC="${CC}" DEBUG_CFLAGS="" OPTIONS_CFLAGS="${CFLAGS}"
+		USE_ZLIB=1 USE_CPU_AFFINITY=1 CC="${CC}" CFLAGS="${CFLAGS} -fno-
+strict-aliasing -fwrapv"
 
 OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL DEVICEATLAS
 OPTIONS_RADIO=		PCRE

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Wed Apr 19 16:21:33 2017	(r438890)
+++ head/net/haproxy/Makefile	Wed Apr 19 16:30:09 2017	(r438891)
@@ -23,7 +23,7 @@ DEVICEATLAS_DISTFILE=	deviceatlas-enterp
 DEVICEATLAS_REGISTRATION_URL=	https://deviceatlas.com/deviceatlas-haproxy-module
 
 MAKE_ARGS=	TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \
-		USE_ZLIB=1 USE_CPU_AFFINITY=1 CC="${CC}" DEBUG_CFLAGS="" OPTIONS_CFLAGS="${CFLAGS}"
+		USE_ZLIB=1 USE_CPU_AFFINITY=1 CC="${CC}" CFLAGS="${CFLAGS} -fno-strict-aliasing -fwrapv"
 
 OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL DEVICEATLAS
 OPTIONS_RADIO=		PCRE