git: ceab30bfe243 - stable/13 - mk: Move vm stack test debug symbols
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 12 Feb 2025 01:44:31 UTC
The branch stable/13 has been updated by jlduran:
URL: https://cgit.FreeBSD.org/src/commit/?id=ceab30bfe243793bc34420ab885b066dd45b23a1
commit ceab30bfe243793bc34420ab885b066dd45b23a1
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-12 01:41:18 +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
(cherry picked from commit 88d448ec815c1fda27be94846f88ccd96251febd)
(cherry picked from commit 955f974a1a37cf3ae8b241327b1fef74c8932855)
---
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 0e7060eedd52..b9e5f30f1f35 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
+
# 20241201: new clang import which bumps version from 18 to 19
OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_builtin_vars.h
OLD_FILES+=usr/lib/clang/18/include/__clang_cuda_cmath.h
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 9c0ee12ba110..4a580e0ed32a 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -239,7 +239,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