Date: Sun, 13 Feb 2022 01:21:29 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 15f9fa2d5b3c - 2022Q1 - x11/cde: Fix build under 14-CURRENT Message-ID: <202202130121.21D1LTGe033855@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=15f9fa2d5b3c6c3babc70ba1037426b2a4e7532d commit 15f9fa2d5b3c6c3babc70ba1037426b2a4e7532d Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2022-02-12 18:14:18 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2022-02-13 01:21:14 +0000 x11/cde: Fix build under 14-CURRENT Under 14-CURRENT MALLOC_PRODUCTION is not set which puts malloc() into debug mode. In debug mode malloc() enables opt.junk to write junk to newly malloc()ed heap in order to help developers discover memory allocation bugs. Unfortunately CDE's dtinfogen assumes newly malloc()ed memory is zero filled (i.e. not filled with junk), resulting in "flex scanner jammed". This likely causes parsing of the junk past the end of any legitimate statements. This affects stock 14-CURRENT without MALLOC_PRODUCTION enabled. This is accomplished by setting the make environment variable MALLOC_CONF=junk:false. See malloc(3) for a complete description of MALLOC_CONF=junk:false. (cherry picked from commit 50324bba317cf1f58e8c434e0e2ed129cded3887) --- x11/cde/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/x11/cde/Makefile b/x11/cde/Makefile index 257ecc4ea23c..afc2a5219849 100644 --- a/x11/cde/Makefile +++ b/x11/cde/Makefile @@ -37,6 +37,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} ALL_TARGET= World MAKE_ARGS+= PERL=${PERL} "LOCAL_LDFLAGS=${LDFLAGS}" MAKE_JOBS_UNSAFE=yes +MAKE_ENV= MALLOC_CONF=junk:false SUB_FILES= pkg-message LDFLAGS+= -z muldefs #--allow-multiple-definition
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202130121.21D1LTGe033855>