From nobody Tue May 27 09:32:45 2025 X-Original-To: dev-commits-src-main@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 4b66qf0CqBz5xBjg; Tue, 27 May 2025 09:32:46 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b66qd5vFtz3cj9; Tue, 27 May 2025 09:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748338365; 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=AR4AbnlVHI/YlMX5+u4NlqxS0Tphutf8duOQggrOj2Y=; b=jS1DDpDO6ZNfCIfn8USrj8tGRWyFdWN7ZRfCK9GE8OcXxzwFbvrmS96PnCyj8g47qp5LRR mPvHO/Rwg2kUMobPgNyOe46M/KxfwAZbvLBfSqEHDXChCtwylXDq2G2qXB9RGOJbOZ/dOZ z5iGJyciMqtxIgZKAweAd7vIwoL8FzjLDfx8/tXnHoZgJqOjYRP21BTbSr1S/eADSeJ5ma hN+9UpkEkZNjqNpa4mZBx6QaiSHviotTpNSjp5eqZdwgJOwhVXH146xQj8kXEaY9UxQ1xh NumLiS2p061/0FrKPKIoKsNW3Oj9mpCG86KXxAnBwiA/INgrQQZYCUKUczbfYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748338365; a=rsa-sha256; cv=none; b=VZDOuLM+NtxjszYAIY9o74lNT7+xqRUB924rP7LkZlWeXLCz106V+najgk3aOedcsqaVVc bvdR8RRxwx5bEdJkTtcVgeoPfRg8t+KwR+E0f6VHdn6p/UNrkjGG3ikMLgnX+P4+b7mlwF PAbopKqiZsqahQx5YIcF2voEYFDb3XyhHTmu3uJDtJ1aCMpHiBVpG3nb7gjwzDlXMdnb2g NawYEhA+mA2AOi/RXZ8fLD1xP1COgZbPKIabjK7Dg/GfE3wFypnvJV0Zo4MGvBtHpq8DkU FzKwyaWwptXWQK8SgarSpTU2Ju9rA+eYizNsqveBIqRKjUccQi0HO40VWWNFWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748338365; 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=AR4AbnlVHI/YlMX5+u4NlqxS0Tphutf8duOQggrOj2Y=; b=ogNMUWESfPy8mAEL2d5gC5DfVAXoCR4Ov6qppynNuAIj66Ky2W+Pg5I6iqubKsJXo10xJf C+KDMja7WGE14tZ2AO6wERQIKiLERy++9e+HxvpnY/VjE23SBeNJjjVPsLEdqhfizrW3zM k1V165tP4vUiBRSPSlFRRWQQ4zGBuH59oA2CKmWnXnGVXdCYBXkZVIHXiWqXh2RaEqACGw N46KJMIqFLGV+QHp4ro+OZcIgMbVyzOeA9oYcUjGoT9ihkLfXv7d+f1FV7GKQHrnMJVBDb jFSkwtdugKb9vXBNFgHWVM1nrct5+JfvzP93MfnkM99FtwApIumw8ySOOgh2Bw== 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 4b66qd5L0VznSx; Tue, 27 May 2025 09:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54R9Wj8B066236; Tue, 27 May 2025 09:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54R9WjCg066233; Tue, 27 May 2025 09:32:45 GMT (envelope-from git) Date: Tue, 27 May 2025 09:32:45 GMT Message-Id: <202505270932.54R9WjCg066233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d67f1132f018 - main - Revert commit e89d737041d1 (config.5: Document CONF_CFLAGS under 'makeoptions'). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d67f1132f0181af3ca6502c562e7fb00ad4deecd Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d67f1132f0181af3ca6502c562e7fb00ad4deecd commit d67f1132f0181af3ca6502c562e7fb00ad4deecd Author: Olivier Certner AuthorDate: 2025-05-27 09:31:15 +0000 Commit: Olivier Certner CommitDate: 2025-05-27 09:31:15 +0000 Revert commit e89d737041d1 (config.5: Document CONF_CFLAGS under 'makeoptions'). Was committed inadvertently before review, and does not have the proper tags. --- usr.sbin/config/config.5 | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/usr.sbin/config/config.5 b/usr.sbin/config/config.5 index 246e20c081ae..93d65819d1d8 100644 --- a/usr.sbin/config/config.5 +++ b/usr.sbin/config/config.5 @@ -316,27 +316,11 @@ variable is specified, .Ar value is assumed to be the empty string. .Pp -Note that, as the common makefiles override the -.Va CFLAGS -variable after having processed the configuration file, -customizing -.Va CFLAGS -directly via -.Ic makeoptions -is not possible. -However, custom compiler flags can be specified using the -.Va CONF_CFLAGS -variable. -They are appended after most of the flags automatically going into -.Va CFLAGS , -allowing to override those that are not essential to the build process. -.Pp Example: .Bd -literal -offset indent -compact makeoptions MYMAKEOPTION="foo" makeoptions MYMAKEOPTION+="bar" makeoptions MYNULLMAKEOPTION -makeoptions CONF_CFLAGS+="-DSOME_CONTROLLING_MACRO" .Ed .\" -------- MAXUSERS -------- .Pp