From nobody Sun Feb 13 01:15:25 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4127E1950E84; Sun, 13 Feb 2022 01:15:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jx8Y95wlwz4kfW; Sun, 13 Feb 2022 01:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644714925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BlCedWJ4nSCO/qX/jqyI1bhuavka94cVVuWQv12jDU=; b=L0c9ChVMLD8/n0C0JDevGTVJ7PTqf5+cAX7PeEvNhPvyDRs0HDiZgh4LT0qU0z2cQ7fz6V FHQV1N5LOQtogLWP/QNWTm66YbZSr8+Spe+hVIla98u+bZM8Kz9N9HZaXEZDFhQtilKz0J H8qiPko+ckbt522DhD4o3UO/Oo/dhy5VUBl8whtxlSNrJzgK0BKZwL+a+QC4sB32oFYnxI pug5r6Gp6j4x/adzQvpCvc9KRV5biZrebFCAGBMVHuJ1H07sHotszT/zGXEHyf6/1zikbg MNe9NhAs8NYnoF8ICpAlisq8Ss8iIMVFUifjzAQYelV7KlgbAIQpa8riCfCRig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AC9B91205C; Sun, 13 Feb 2022 01:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21D1FPFS025147; Sun, 13 Feb 2022 01:15:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21D1FPPu025146; Sun, 13 Feb 2022 01:15:25 GMT (envelope-from git) Date: Sun, 13 Feb 2022 01:15:25 GMT Message-Id: <202202130115.21D1FPPu025146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 50324bba317c - main - x11/cde: Fix build under 14-CURRENT List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50324bba317cf1f58e8c434e0e2ed129cded3887 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644714925; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8BlCedWJ4nSCO/qX/jqyI1bhuavka94cVVuWQv12jDU=; b=AOnXPGYUsaC2TsiveR5q6PsFwsk360nkw/UDpafd1YKG9osqDMNbfALFMwRvbsgTGD5W8X JhHWf0uAf/9PbUxZ2Bl7NBVXxFkiWK0FKtVLsNzmHGKVYbIwPxUhOdcZRqdZ3+di3osbO5 kTicwPPAXBodj8NIrB98JAIgyY4kKYO5jIXNDYnZDTAU26pJIrxOzk/RJTP9HTHvKIFuko rY0B0Iky6DKvld94touLhlixkekSXm5Ore4G7G9QjCMop42e2NCiBORZtxUcW6zdaaHXp7 p65FBgFYw102xsJrPUZO2Fq5gjUaRhQY3yCk//Y6ZZCFh3QdXfR/jTDue889lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644714925; a=rsa-sha256; cv=none; b=ekCJvTRQMKZdOXnNATzarhCsAFTuRoWc7QZujQKz+5fCUitZ6fEx3/txrN/xqtRb4fatQq mOLvf0xOaBOXyEXFPhP8aq3eiaAmIzyKzg/3QF7lfXsOm+42pceo42YiuZF1OlAGsrNVuf 7zvKZnvv6J8rEwC3o1CKJVvr1XCLZ3gXB+9H61LWEAyAFaYqKKw3Ve/gxU5wXTEYBiIAnK e92aHaOI83igyr2lwqlsedBGSgAAhr4B6sqGHzvoL1OPKcsfhZq8JZVqI4/Odnro3brZat TWMikv9f134ApXJPqCtpx4/KKQ+vb5LwO2nb2e2wFBAQLGS04w3QBBpYUxQ9rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=50324bba317cf1f58e8c434e0e2ed129cded3887 commit 50324bba317cf1f58e8c434e0e2ed129cded3887 Author: Cy Schubert AuthorDate: 2022-02-12 18:14:18 +0000 Commit: Cy Schubert CommitDate: 2022-02-13 01:14:13 +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. MFH: 2022Q1 --- 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