pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/haproxy haproxy: Switch to DEBUG_CFLAGS.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/709ea64386f7
branches:  trunk
changeset: 457718:709ea64386f7
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Aug 31 09:17:46 2021 +0000

description:
haproxy: Switch to DEBUG_CFLAGS.

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 joyent/pkgsrc#313.  Bump PKGREVISION.

diffstat:

 net/haproxy/Makefile |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 87359ce68186 -r 709ea64386f7 net/haproxy/Makefile
--- a/net/haproxy/Makefile      Tue Aug 31 09:10:40 2021 +0000
+++ b/net/haproxy/Makefile      Tue Aug 31 09:17:46 2021 +0000
@@ -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/
 
@@ -13,7 +14,7 @@
 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



Home | Main Index | Thread Index | Old Index