From nobody Mon Dec 04 10:39:39 2023 X-Original-To: dev-commits-src-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 4SkKt33PmGz53CrX; Mon, 4 Dec 2023 10:39:39 +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 4SkKt32fM7z4S2J; Mon, 4 Dec 2023 10:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686379; 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=MwKcHwlQ7lCMioJyp/vGstBigVg0BTZFd5c2JAsqngc=; b=dG9FdJGiuHUmda4uwmvXmG+XSEeZU8KQPjZOjwgeLH3FAuWI/1P/E99cuGy2eO39rMBzEL QPZayb4KaVHpH1JOB12z8CcHe3tzGqKQ7gmszLcWUvsdPbmXocGuo0g01Uf8CyKhbrqL6M 22c8JJK2H7ROrW4AGmSHkV3vTRh9RDLbLAFpSRLrmHOXLqWSFn9Ohg7OGuCQEnWZrX7scD NtPzz5ajyRyNzTZfRO2qQAZ4uaxMAK4zjlMrl/pZ36gWO9Yhxt9X9nLAXerTz1NwADjxvW nUgu63bN0ZvhvWHXQ2kDjDVWJbFaklExICxGGo3zMdMeR2TguWa8zJxV44lWBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701686379; 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=MwKcHwlQ7lCMioJyp/vGstBigVg0BTZFd5c2JAsqngc=; b=yKg8yg+iqYub4yCMVMdJhMabthZNDpZmaZmywdktH5TorVzEcLr50uYeOeDVOAhdyF46X6 VXvfCgP5D4FeKvDCQsIvo4EO2br5ueUBaTLWw2kHt5r8H0+BDyC8phvBlGnOSahEzsh80m 6iuaeGqvH3JUGsaXW7c13de2XarfSsAlYVyEs8K3ag9LnbXiALN1c0vvrHDjt/5o6Sdwc6 MkADl2gU9IlV3+mh6xkRS0e9mqyAlULjicAOm8vCtRsEUX+BtsXAeWcHjFL/qWICwHcvGs 2WRtHvsil2Yc+RqWr1pBhYX8WbkFDtPTVTcMOLSRcLdh89c06UyZr12rcO7ueg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701686379; a=rsa-sha256; cv=none; b=S+58FoQwEDp5QwZS8jBJ0nfG0+pF8/B/ErLpIwIMOHo0bgpyLpwBrxP94ExlaF6Cwy8bsi jBBcit+qSJOCEIoc1j29aI3H0CxPzzDG3tDwTeROlKcOF62kJUJc4QWnlnEBPTUEjmoYfV yssn63LEjxtRMsW6dHJJf+lPhLRG2LOIvfWkL7RKwqUM9rdzSOo34bV8u/gDdWGjFufwHz q1M1U+arfHrYDNLrJEAbLg3iLuIKk2xipTvdaaKMJWOJk8sKvpLzx1WuFFuqt91F81ClZT 7qRDO72fLOB69JAz6uqvDROzkxPnQHewUBdr2Q95hNfIW0tRhby1ASqj6HOREA== 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 4SkKt318ypz80G; Mon, 4 Dec 2023 10:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B4AddBS010315; Mon, 4 Dec 2023 10:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B4Addwm010312; Mon, 4 Dec 2023 10:39:39 GMT (envelope-from git) Date: Mon, 4 Dec 2023 10:39:39 GMT Message-Id: <202312041039.3B4Addwm010312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7b68016c7678 - stable/13 - pkgbase: set the prefix of debug files and macros to /usr/src List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b68016c7678db478cb8ac7a15fa821c0231fccc Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7b68016c7678db478cb8ac7a15fa821c0231fccc commit 7b68016c7678db478cb8ac7a15fa821c0231fccc Author: Baptiste Daroussin AuthorDate: 2023-11-13 17:18:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-12-04 10:39:16 +0000 pkgbase: set the prefix of debug files and macros to /usr/src When the macro PACKAGE_BUILDING is set, then consider we are building package for pkgbase, this has already been used in Makefile.inc1 and reuse the PACKAGE_BUILDING macros already used for that purpose in the ports tree In the future this should be tied to REPRODUCIBLE_BUILD MFC After: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42569 (cherry picked from commit 030af1b62d7b9a86f5ecdceff5a1fa23e9570be1) --- share/mk/src.sys.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk index edf369638d9d..d5c2af0c559d 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -38,6 +38,9 @@ __postrcconf_${var}:= ${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno # default over to -fno-common, making this redundant. CFCOMMONFLAG?= -fno-common CFLAGS+= ${CFCOMMONFLAG} +.if defined(PACKAGE_BUILDING) +CFLAGS+= -fmacro-prefix-map=${SRCTOP}=/usr/src -fdebug-prefix-map=${SRCTOP}=/usr/src +.endif DEFAULTWARNS= 6