Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Feb 2025 14:48:25 GMT
From:      Jose Luis Duran <jlduran@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 88d448ec815c - main - mk: Move vm stack test debug symbols
Message-ID:  <202502041448.514EmPpS004525@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jlduran:

URL: https://cgit.FreeBSD.org/src/commit/?id=88d448ec815c1fda27be94846f88ccd96251febd

commit 88d448ec815c1fda27be94846f88ccd96251febd
Author:     Jose Luis Duran <jlduran@FreeBSD.org>
AuthorDate: 2025-02-04 14:47:24 +0000
Commit:     Jose Luis Duran <jlduran@FreeBSD.org>
CommitDate: 2025-02-04 14:47:24 +0000

    mk: Move vm stack test debug symbols
    
    Avoid the creation of a /usr/tests/sys/vm/stack/.debug directory by
    placing sys/vm/stack test debug symbols under /usr/lib/debug.
    
    Reviewed by:    emaste
    Approved by:    emaste (mentor)
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D48796
---
 ObsoleteFiles.inc   | 3 +++
 share/mk/bsd.lib.mk | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index e17ca9608cca..aff94af72c17 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20250204: sys/vm/stack test symbols moved to /usr/lib/debug
+OLD_DIRS+=usr/tests/sys/vm/stack/.debug
+
 # 20250129: libdevinfo bumped to version 7
 OLD_LIBS+=lib/libdevinfo.so.6
 
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index cf8057907a1f..a4b2e4d11125 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -254,7 +254,8 @@ SHLIB_NAME_FULL=${SHLIB_NAME}.full
 # Use ${DEBUGDIR} for base system debug files, else .debug subdirectory
 .if ${_SHLIBDIR} == "/boot" ||\
     ${SHLIBDIR:C%/lib(/.*)?$%/lib%} == "/lib" ||\
-    ${SHLIBDIR:C%/usr/(tests/)?lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib"
+    ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" ||
+    ${SHLIBDIR:C%/usr/tests(/.*)?%/usr/tests%} == "/usr/tests"
 DEBUGFILEDIR=${DEBUGDIR}${_SHLIBDIR}
 .else
 DEBUGFILEDIR=${_SHLIBDIR}/.debug



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502041448.514EmPpS004525>