From nobody Sun Feb 13 01:21:29 2022 X-Original-To: dev-commits-ports-branches@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 8FCC11951F10; Sun, 13 Feb 2022 01:21:29 +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 4Jx8h93hRpz4kqT; Sun, 13 Feb 2022 01:21:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644715289; 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=Zxnpn/yoFT88PI/LWDHnctrarS4lm4dZXGWvEGII15w=; b=gab8R2deEeAVwv519U8Fm3QOflY2bfxRDNhyGQHmdKfKgx7Dh0rC/HEARYQeeCC6S0LAun muz3RGtzs5zU1ohhf/lGwZ5oq3n++ntaG8gC2vmr5QLlfaM0QRG18I+tMeBlYfg4Y+5UhA Q4DUyTanp6ZJONS1zBx1qDjq61CHhtnerIXl/vKvFv0nsWmfwaz3XpF9CG0EqXoLnlvs5D Ra9+rE6/HwG12LdCaAah9AvDMuI7hT+VjjWzB92kQAkrn3SwH5hRHuDQBO8ICgXfHXJho8 DfkFEI0hQhzjIviTyqZDfSz6apPjUtlwsGaxiYP7ZmH8XtHVrLuT9yZ4z1aGeg== 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 5E69E125C2; Sun, 13 Feb 2022 01:21:29 +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 21D1LT2Y033856; Sun, 13 Feb 2022 01:21:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21D1LTGe033855; Sun, 13 Feb 2022 01:21:29 GMT (envelope-from git) Date: Sun, 13 Feb 2022 01:21:29 GMT Message-Id: <202202130121.21D1LTGe033855@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 15f9fa2d5b3c - 2022Q1 - x11/cde: Fix build under 14-CURRENT List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 15f9fa2d5b3c6c3babc70ba1037426b2a4e7532d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644715289; 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=Zxnpn/yoFT88PI/LWDHnctrarS4lm4dZXGWvEGII15w=; b=qs3Lm48QPpoFZbfJccAV4Gh06P4sfXwNvMH53SZiqH3Qx0ms932HlYffUk5HomjHvu4jFu /nf01ddMWe/hbilUyUGwrFUGIIBqwl80jtnPuJ8p8Rye7rbyd108V7j2DB7Jqc/Yj1F72r qCfJYRlELcqf3BEYOKnt7JRJ7TCZ7FUF4Ws2GgFYNKh/aQiU8Kt4EAnTC3wzYVrDNgdFeV tAKemjPho3vtRWcv/QSXKiihA5lLvx9L7LfeIUIfrrPr3qpNT/CXqP71kJZbsZPUuaw9EB 2IU6I0s0UiD92nZdRgZMtIhuJxdJNpandxbyzNdkd/W3DiXdo/xkD+tz1BnPrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644715289; a=rsa-sha256; cv=none; b=Pd8k+ZcCweFWq4v4D27/Zt3lQuvzrcRTHO5MYcK3RuveZBU+M1gibH5vAmshv9acaMqkh1 xaQV30rTEIqbE0CIAEGxbvZVc8zjqzejMf5ydCJ9FQQB5mAYaHc7MUi8Izxoz5DumVuuw0 46w2DSkJ5MluQGXZRi1WzVRVV519F4OMbMc5AvdDyrkbzrFYSANgPphMaJlzpP66nz2OMw Xz/HiJFHQDElpb18Q/Kpz7JHhSpKuzkT6nuHDRoz0QGKKzJ2egQ3AO8lxfFA+/u74LCQHj rwrb9cMvxnV7G7Hb7FX8tF9owKl3l2aUOS6gAsYudQqpNlw0c5iWBNP3HqL+Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=15f9fa2d5b3c6c3babc70ba1037426b2a4e7532d commit 15f9fa2d5b3c6c3babc70ba1037426b2a4e7532d Author: Cy Schubert AuthorDate: 2022-02-12 18:14:18 +0000 Commit: Cy Schubert 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