aboutsummaryrefslogtreecommitdiffstats
path: root/net/haproxy
diff options
context:
space:
mode:
authordemon <demon@FreeBSD.org>2017-04-20 00:30:09 +0800
committerdemon <demon@FreeBSD.org>2017-04-20 00:30:09 +0800
commitc32999b516b92d5bfeace89dd4c9c7e30b7db426 (patch)
tree20efa0d90affa02321237489eef11267262516bf /net/haproxy
parent527b8eab18e7fdb5dbc03f46a8b26e83fe89339c (diff)
downloadfreebsd-ports-gnome-c32999b516b92d5bfeace89dd4c9c7e30b7db426.tar.gz
freebsd-ports-gnome-c32999b516b92d5bfeace89dd4c9c7e30b7db426.tar.zst
freebsd-ports-gnome-c32999b516b92d5bfeace89dd4c9c7e30b7db426.zip
Overriding OPTIONS_CFLAGS was a bad idea.
backout last commit and use CFLAGS as before.
Diffstat (limited to 'net/haproxy')
-rw-r--r--net/haproxy/Makefile2
-rw-r--r--net/haproxy/files/patch-Makefile11
2 files changed, 1 insertions, 12 deletions
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 45e535d8fef4..1e3771e1e005 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -23,7 +23,7 @@ DEVICEATLAS_DISTFILE= deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
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
diff --git a/net/haproxy/files/patch-Makefile b/net/haproxy/files/patch-Makefile
deleted file mode 100644
index 3c74b35769c9..000000000000
--- a/net/haproxy/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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