The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=848ff9bc1b97b04a0b7328ec7079fb031fef452d
commit 848ff9bc1b97b04a0b7328ec7079fb031fef452d Author: Mark Johnston <[email protected]> AuthorDate: 2023-08-01 14:11:23 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2023-08-01 14:11:42 +0000 libdtrace: Explicitly set SHLIBDIR and SHLIB_MAJOR They were previously being defined by cddl/lib/Makefile.inc, and as of commit 4ae699122810 were being overridden by defaults in bsd.own.mk, which changed SHLIBDIR to /usr/lib. Reported by: Domagoj Stolfa <[email protected]> Fixes: 4ae699122810 ("dtrace: Add WITH_DTRACE_ASAN") --- cddl/lib/libdtrace/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index a6a7b90d3d39..d6771aee37b6 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -7,6 +7,10 @@ PACKAGE= dtrace LIB= dtrace + +SHLIBDIR= /lib +SHLIB_MAJOR= 2 + SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \
