Skip to content

Commit

Permalink
haproxy: Switch to DEBUG_CFLAGS.
Browse files Browse the repository at this point in the history
The software depends on compiler flags (-fwrapv) for specific overflow
handling, but for some strange reason instead of appending them during
the build regardless of what the user has set CFLAGS to, it allows
CFLAGS to be overridden and aborts at runtime!  Passing in our CFLAGS
via DEBUG_CFLAGS, while not ideal, allows them to be properly combined.

Fix from goekesmi in TritonDataCenter#313.  Bump PKGREVISION.
  • Loading branch information
jperkin committed Aug 31, 2021
1 parent 7b5ff15 commit 468dca5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/haproxy/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.83 2021/08/20 05:42:53 adam Exp $
# $NetBSD: Makefile,v 1.84 2021/08/31 09:17:46 jperkin Exp $

DISTNAME= haproxy-2.4.3
PKGREVISION= 1
CATEGORIES= net www
MASTER_SITES= https://www.haproxy.org/download/${PKGVERSION_NOREV:R}/src/

Expand All @@ -13,7 +14,7 @@ USE_LANGUAGES= c
USE_TOOLS+= gmake
BUILD_MAKE_FLAGS+= ADDLIB=${COMPILER_RPATH_FLAG}${PREFIX}/lib
BUILD_MAKE_FLAGS+= CC=${CC:Q}
BUILD_MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
BUILD_MAKE_FLAGS+= DEBUG_CFLAGS=${CFLAGS:Q}
BUILD_MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
BUILD_MAKE_FLAGS+= TARGET=${TARGET}
BUILD_MAKE_FLAGS+= USE_REGPARM=1
Expand Down

0 comments on commit 468dca5

Please sign in to comment.