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

[Dmitry Sivachenko]

Author: demon
Date: Wed Apr 19 12:57:56 2017
New Revision: 438838
URL: https://svnweb.freebsd.org/changeset/ports/438838

Log:
  Do not override CFLAGS defined in Makefile; use OPTIONS_CFLAGS to pass our
  CFLAGS env variable;
  
  Add -fwrap to CFLAGS to fix eventual haproxy spins when compiled with newer
  versions of clang (FreeBSD-11 is affected). -- obtained from haproxy source tree.

Added:
  head/net/haproxy-devel/files/patch-Makefile   (contents, props changed)
  head/net/haproxy/files/patch-Makefile   (contents, props changed)
Modified:
  head/net/haproxy-devel/Makefile
  head/net/haproxy/Makefile

Modified: head/net/haproxy-devel/Makefile
==============================================================================
--- head/net/haproxy-devel/Makefile	Wed Apr 19 12:25:40 2017	(r438837)
+++ head/net/haproxy-devel/Makefile	Wed Apr 19 12:57:56 2017	(r438838)
@@ -24,7 +24,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}" CFLAGS="${CFLAGS}"
+		USE_ZLIB=1 USE_CPU_AFFINITY=1 CC="${CC}" DEBUG_CFLAGS="" OPTIONS_CFLAGS="${CFLAGS}"
 
 OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL DEVICEATLAS
 OPTIONS_RADIO=		PCRE

Added: head/net/haproxy-devel/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/haproxy-devel/files/patch-Makefile	Wed Apr 19 12:57:56 2017	(r438838)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2017-04-19 13:18:14.404480000 +0300
++++ Makefile	2017-04-19 13:18:26.684393000 +0300
+@@ -128,7 +128,7 @@ DEBUG_CFLAGS = -g
+ #### Compiler-specific flags that may be used to disable some negative over-
+ # optimization or to silence some warnings. -fno-strict-aliasing is needed with
+ # gcc >= 4.4.
+-SPEC_CFLAGS = -fno-strict-aliasing -Wdeclaration-after-statement
++SPEC_CFLAGS = -fno-strict-aliasing -Wdeclaration-after-statement -fwrapv
+ 
+ #### Memory usage tuning
+ # If small memory footprint is required, you can reduce the buffer size. There

Modified: head/net/haproxy/Makefile
==============================================================================
--- head/net/haproxy/Makefile	Wed Apr 19 12:25:40 2017	(r438837)
+++ head/net/haproxy/Makefile	Wed Apr 19 12:57:56 2017	(r438838)
@@ -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}" CFLAGS="${CFLAGS}"
+		USE_ZLIB=1 USE_CPU_AFFINITY=1 CC="${CC}" DEBUG_CFLAGS="" OPTIONS_CFLAGS="${CFLAGS}"
 
 OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL DEVICEATLAS
 OPTIONS_RADIO=		PCRE

Added: head/net/haproxy/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/haproxy/files/patch-Makefile	Wed Apr 19 12:57:56 2017	(r438838)
@@ -0,0 +1,11 @@
+--- Makefile.orig	2017-04-19 13:18:14.404480000 +0300
++++ Makefile	2017-04-19 13:18:26.684393000 +0300
+@@ -128,7 +128,7 @@ DEBUG_CFLAGS = -g
+ #### Compiler-specific flags that may be used to disable some negative over-
+ # optimization or to silence some warnings. -fno-strict-aliasing is needed with
+ # gcc >= 4.4.
+-SPEC_CFLAGS = -fno-strict-aliasing -Wdeclaration-after-statement
++SPEC_CFLAGS = -fno-strict-aliasing -Wdeclaration-after-statement -fwrapv
+ 
+ #### Memory usage tuning
+ # If small memory footprint is required, you can reduce the buffer size. There