From nobody Tue Nov 14 07:43:18 2023 X-Original-To: dev-commits-src-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 4STyvq0YqSz50r9l; Tue, 14 Nov 2023 07:43:19 +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 4STyvq04fTz3XDt; Tue, 14 Nov 2023 07:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699947799; 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=5Dtnnv3MiB3cyKT3QfNxHc3h7MyKcxyaeLUr+UbyYoQ=; b=OIHfXx3GTyq1OIsU2S0sU1j0XNUJ8V/tjKQf3oP5l/SuRPknNvr78jEapK3wa8ZnYIlMUt 2n2pc5euY6+m6L8reK2RwdB+393aiKIEfqoV3jdHG9vozL9cmXUf7/Oeu0apAYEDiPAZR8 iv9A4uukXWxLO4zNLCTIGPEe3Wo1iB1W0mOGIyGciCEEIob0oUOv36RpNGVR0MU8yuM8x4 46XOEiv+VU+0t2OY9buv/4bOAP1XSLNKb/EYsNBkvwEudg1e9WQD8Duhv7KqknXt9zFlFi a7HEiOmQRIoSmOQj7m5K53nl3GONQFIHuT0Etxv9zx2f3UinNYeVuNEHpUz/1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699947799; 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=5Dtnnv3MiB3cyKT3QfNxHc3h7MyKcxyaeLUr+UbyYoQ=; b=IoAxjL36sR9HPWnEQb/jCybdHRO6bCapgV2Lp2+tyMBYIGUUI9rmIaGpuxc8eZ00siTEuE 6h2A//7Sryz+wRyThmpSMfD5EfV+dBYVulxpDCEviKKcGj0gk8B0EuYcEhwbTClnDfhHT+ yTZ+7PE4YAnK5EehQ9okUq93qydvSGUaKEx1CzyeZgCovoBxgFbN3vadEdBqU80s4t4oHp qxP0otF/uqALdXAlRktDF45iOr5sBF8oIhDcClIOkGEmE+zrmQo5zT5C6SARABaCPBuNgS BTWS5gOU/iH78RNBCCyeMTF7A/Wcuy94p8t1EEkwIHmv1uES1QB5ufilbdDueg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699947799; a=rsa-sha256; cv=none; b=i4DumhzSerRe6fs3JdQJck3D8CgwUm49ieCWngtjCX0IYNYFbqEas4pDnCl4l+rYCYiChM 22TnkhdtO3PtzAKdW0cVsC/RY6sVtWd6v/38qTwY5lsYYF17wOK98MygUGncPmDkopU2Rq 6zj1YvmlgsF2plzi18plCpEi1Xhp3hDPJdCm5K2eoGe9Oow1PDE5eQziiYAKN+sLXdAql/ 17KknHYwjJXJYr7x5T31yApo0u/3FsPPhBTJh2QW8Lotg35l0TTyouuPlA6qtuVaiF6MjS NoNa0NGmlGXDxon6TrKGl9u4bsVGyrFbN4EAN8vXLFoD714nkM6VmWk/uYCWzg== 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 4STyvp6HTkzgWt; Tue, 14 Nov 2023 07:43:18 +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 3AE7hIHm099348; Tue, 14 Nov 2023 07:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AE7hIWT099346; Tue, 14 Nov 2023 07:43:18 GMT (envelope-from git) Date: Tue, 14 Nov 2023 07:43:18 GMT Message-Id: <202311140743.3AE7hIWT099346@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 030af1b62d7b - main - pkgbase: set the prefix of debug files and macros to /usr/src List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 030af1b62d7b9a86f5ecdceff5a1fa23e9570be1 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=030af1b62d7b9a86f5ecdceff5a1fa23e9570be1 commit 030af1b62d7b9a86f5ecdceff5a1fa23e9570be1 Author: Baptiste Daroussin AuthorDate: 2023-11-13 17:18:58 +0000 Commit: Baptiste Daroussin CommitDate: 2023-11-14 07:43:15 +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 --- 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