From nobody Sat Dec 02 09:45:30 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 4Sj4mV6NB2z52hgr; Sat, 2 Dec 2023 09:45:30 +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 4Sj4mV5xg8z3YCJ; Sat, 2 Dec 2023 09:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510330; 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=E0szUKK0vyIhT2JpdxzQ/MyibzEhtO3NZgOvT5JRVAs=; b=MlhEaGD6fVy9bnSpM/FBKF3o5ze/in2Jeuj/vDWf8xpnFegj8GJwyH6UIE1cSfpyK28nSd Aqps36ikaSLevrh/U5TB8SCUtBaRFLQjkjChhMQmW2PM7rzkGah4CzmXlMn/g/p9qZnLJi 95OjFqc5JuZmgGEnph1WbKFfTyXUQJAvSbAa8YQD3MUV8yyTnoirL5wbbmAh9U6RBZt73M ZdkbRVnzGfRGUcC6w9GKlAk+L6bKhXew2XtO7TSN3tI1RFytPZ13Bxwlm+VM/KisMpsrA5 TjPdCLZjzlBVvY5P0TUw0W8NcoVOxbOe4qf5cBNMjIOL1vb9cAjlr2sqiwtLJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701510330; 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=E0szUKK0vyIhT2JpdxzQ/MyibzEhtO3NZgOvT5JRVAs=; b=erb/qWVF4/k0SXSbXGTQLZaGXEyfzPsHx5gZMgr11yiVBDikmQwO5Rq1FKcxFELU6c1acz GiXa+MBvf3FuA8Tvu+j1NY0IRYxrWs2Tn9k2MMjxXAjODBpeUk68jKVNUH8/QRVIzn1WQQ yfdZAJ7twKFf5NkUXKn4a6brGlf6vkXJgJfFtS9CCGDIMF4sdrNIasyDFxCenxTVFijhpI UWFAw1zQb08zz0dZVHnLuu7Ry1y5K/ivieiapCNJ7dA21JmGpMdOf7KA/CKCj10It6y104 fFD8zpRuiMBUJsBhipbc/EIpwQeMuzUjtZE5v7E6VDvsBkgM3UAKRkBUgS53OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701510330; a=rsa-sha256; cv=none; b=kzQ0slZiZYaBiD8Cu8lnjbuND9bmwRiE66tXFlNe2AankSVbJIRxBslr1Pdomfz9HYWNDM vxU61xM1k+qSx02joe9IPXuPgJR39MXVQWrz3aMQzApw45MOmRQmi66jYU1upQVqlsMsSp SiLVKuldsKHml9QWdvf0kDLPG0OnJOh0RTED6au7lxdgBJGvJOlVib5QIyxLCvPcfPA/dQ 52KDoEtsASxRWl78G5/x89zavvCOcxxLsd29/8zn8NK8IPxXdcUdXjNgzBvAn+KJukt5Fg lANB45/qZv5TNLkxslB0WFjkRWi+BhYljNnitCsFGagR5qhQHHio8NjtzkmbmQ== 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 4Sj4mV50pNz1B5Z; Sat, 2 Dec 2023 09:45:30 +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 3B29jUXm011412; Sat, 2 Dec 2023 09:45:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B29jUSZ011409; Sat, 2 Dec 2023 09:45:30 GMT (envelope-from git) Date: Sat, 2 Dec 2023 09:45:30 GMT Message-Id: <202312020945.3B29jUSZ011409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 7cedaf50721b - stable/14 - 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7cedaf50721b125b5c46f8e974806248356787bf Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7cedaf50721b125b5c46f8e974806248356787bf commit 7cedaf50721b125b5c46f8e974806248356787bf Author: Baptiste Daroussin AuthorDate: 2023-11-13 17:18:58 +0000 Commit: Emmanuel Vadot CommitDate: 2023-12-02 09:44:04 +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