The branch main has been updated by asomers:
URL:
https://cgit.FreeBSD.org/src/commit/?id=b5962a183756f2cfc93b056ce7c7c7beb5da3e7e
commit b5962a183756f2cfc93b056ce7c7c7beb5da3e7e
Author: Alan Somers <asom...@freebsd.org>
AuthorDate: 2025-06-26 14:04:50 +0000
Commit: Alan Somers <asom...@freebsd.org>
CommitDate: 2025-06-26 14:12:04 +0000
Fix location of libtpool.so.2 after 5c1ba994a8b
Commit 5c1ba994a8b inadvertently moved the installed location of a
shared library. Move it back.
Reported by: olivier
Tested by: olivier
Fixes: 5c1ba994a8bcb6676ea3d1bb21b072b90e2d3ae9
Sponsored by: ConnectWise
---
ObsoleteFiles.inc | 3 +++
cddl/lib/libtpool/Makefile | 1 +
2 files changed, 4 insertions(+)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1f17d54bdf08..dcda9a035b44 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20250626: For 11 days 15.0-CURRENT installed libtpool to the wrong location
+MOVED_LIBS+=usr/lib/libtpool.so.2
+
# 20250626: replace yaml.lua with lyaml
OLD_FILES+=usr/share/flua/yaml.lua
diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
index 3ab625dd306b..7acf34219a47 100644
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -3,6 +3,7 @@
LIB= tpool
+SHLIBDIR?= /lib
LIBADD= spl
PACKAGE= libzfs
