From nobody Fri May 1 12:19:57 2026 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 4g6VV55hTCz6cXKg for ; Fri, 01 May 2026 12:19:57 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g6VV5552mz3JBG for ; Fri, 01 May 2026 12:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777637997; 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=uujeVoWVm0ZW2rPD+kKlaME7gw2FTOTkka3FVeX0FXU=; b=nNscYm4LsJhRxOhHkM10liZoIWWPqidEV421+QkQ8XNVTh1ivfp26TjeReHAlUdlNHIjX5 dLr3/5ItmQdKHnewuM/dz+YRFeuuQUOQ5HvG7+dgSC9eDar2DrJvENPXJpt5SvUFGpLwGV aCukIH5wxY766n674CDbYHFnlfBHxUfYT9yUXBaK9ndZtmCvyU6UCsNxIPwb1pY9UwW3FM I3K0YgF1PyikB9vXGzM5x/sC5O+e3f8F5YGACCI+Q/p4GbVP3L4Ue6NA/DDuWcvwuE6txv Dn3tqMJaTo71OHffSnBkVPdss7NF4RYtxcJ9BZoerBYMlMcJDvCU63L46V0O6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777637997; a=rsa-sha256; cv=none; b=L1ZMtblLiu6HEGtfHJWh+jhSOj7AvZEWIO6SRLsNizGZJonBiR68JxQJq5ZOhRKn0jVyd/ R/nzv6kjn6tcstOQHlBKfYtAE8O3xmnjz/K943KdEvAuoRUPBZZdMf7VRNaGOX2fNnFjAM xj+osGJzp9H/2qiS+++bzFT+9rSAcP4HSDCK9FnBj1TDAXGVLGaCPyy9DzKJ5f+r6/eArx Co8sak6BxbcShIua7NW2Kb9ZFKgJQheCeaIgi0OIQhf6ovmV/vrXrOyS6WakoozfhFWWEf ziqHNF6KiFfMhk59R3xt/muXrQ5566zydNWw0eAzqX4bvEVRFKPEaTfv2BdWbw== 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=1777637997; 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=uujeVoWVm0ZW2rPD+kKlaME7gw2FTOTkka3FVeX0FXU=; b=k794H44Gjiu5VSr5HYsArTMYw4LxdZOr86ww7ef26Rdl9WB9fH/9JMlamHBmHbuWwWuBjg 53tBidFQwryqlI3XaOUmd6dYOthYgGrSXtbahwvr0Dz7uVjc6JFvAr1/dvyABXB0aFbvX7 jC74+UC/yMw0JHGfyIQ5vyxJdQS6S2MsUaPIUXQMsosJYa776jsplyNmAnVQkFXF3ZYRF8 VQA2b5LrbKTSLD1aHuHOtfjckdM3CyTA37rmgkk/TMK/P6ndXCJYZmjoGoRwkfyvGzjeV4 eHem2k5sWg8qlIaBN5o4aDLxY6IeX3ufpPQ6DY406iETjsIIJWC1phsSt2CaCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g6VV54gQlzyJ4 for ; Fri, 01 May 2026 12:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38095 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 01 May 2026 12:19:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 8583bcb5b400 - main - Revert "build: provide a FORTIFY_SOURCE. override" 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8583bcb5b400c4e4d18a563cd749ee9b23750e0a Auto-Submitted: auto-generated Date: Fri, 01 May 2026 12:19:57 +0000 Message-Id: <69f49a6d.38095.bb31d8f@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8583bcb5b400c4e4d18a563cd749ee9b23750e0a commit 8583bcb5b400c4e4d18a563cd749ee9b23750e0a Author: Kyle Evans AuthorDate: 2026-05-01 12:19:17 +0000 Commit: Kyle Evans CommitDate: 2026-05-01 12:19:17 +0000 Revert "build: provide a FORTIFY_SOURCE. override" This reverts commit c46a0b590716144d772eeba83ca88d96ee12c2f1. It broke the build and I'm not awake yet. --- share/mk/bsd.sys.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 5bd8cd3362d1..93e7c8572310 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -321,12 +321,9 @@ SSP_CFLAGS?= -fstack-protector-strong .endif CFLAGS+= ${SSP_CFLAGS} .endif # SSP - -.if empty(CFLAGS:M-D_FORTIFY_SOURCE*) -CFLAGS+= -D_FORTIFY_SOURCE=${FORTIFY_SOURCE.${.IMPSRC:T}:U${FORTIFY_SOURCE}} -.endif -.if empty(CXXFLAGS:M-D_FORTIFY_SOURCE*) -CXXFLAGS+= -D_FORTIFY_SOURCE=${FORTIFY_SOURCE.${.IMPSRC:T}:U${FORTIFY_SOURCE}} +.if ${FORTIFY_SOURCE} > 0 +CFLAGS+= -D_FORTIFY_SOURCE=${FORTIFY_SOURCE} +CXXFLAGS+= -D_FORTIFY_SOURCE=${FORTIFY_SOURCE} .endif # Additional flags passed in CFLAGS and CXXFLAGS when MK_DEBUG_FILES is