In message <202502041448.514empps004...@gitrepo.freebsd.org>, Jose Luis
Duran w
rites:
> The branch main has been updated by jlduran:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=88d448ec815c1fda27be94846f88ccd9
> 6251febd
>
> commit 88d448ec815c1fda27be94846f88ccd96251febd
> Author: Jose Luis Duran <jldu...@freebsd.org>
> AuthorDate: 2025-02-04 14:47:24 +0000
> Commit: Jose Luis Duran <jldu...@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
>
This broke buildworld.
make[5]: "/opt/src/git-src/share/mk/bsd.lib.mk" line 255: Malformed
conditional '${_SHLIBDIR} == "/boot" || ${SHLIBDIR:C%/lib(/.*)?$%/lib%} ==
"/lib" || ${SHLIBDIR:C%/usr/lib(32|exec)?(/.*)?%/usr/lib%} == "/usr/lib" ||'
in /opt/src/git-src/kerberos5/lib/libasn1/Makefile:129
in directory /opt/src/git-src/kerberos5/lib/libasn1
This patch will fix it.
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index a4b2e4d11125..b7d6b333523b 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -254,7 +254,7 @@ 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/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
--
Cheers,
Cy Schubert <cy.schub...@cschubert.com>
FreeBSD UNIX: <c...@freebsd.org> Web: https://FreeBSD.org
NTP: <c...@nwtime.org> Web: https://nwtime.org
e^(i*pi)+1=0
