From 309006a0c6a335fce323395fe83d499f05323fd6 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Fri, 28 Nov 2025 22:59:24 +1100 Subject: [PATCH] libunicode: merge into libzpool It's a single source file that is not used anywhere else, so there's no reason to keep it separate. Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #18071 --- lib/Makefile.am | 1 - lib/libunicode/Makefile.am | 6 ------ lib/libzpool/Makefile.am | 3 ++- 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 lib/libunicode/Makefile.am diff --git a/lib/Makefile.am b/lib/Makefile.am index cd11b3ebd..f2fb1f2ae 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -57,7 +57,6 @@ include $(srcdir)/%D%/libavl/Makefile.am include $(srcdir)/%D%/libicp/Makefile.am include $(srcdir)/%D%/libnvpair/Makefile.am include $(srcdir)/%D%/libspl/Makefile.am -include $(srcdir)/%D%/libunicode/Makefile.am include $(srcdir)/%D%/libzdb/Makefile.am include $(srcdir)/%D%/libzfs_core/Makefile.am include $(srcdir)/%D%/libzfs/Makefile.am diff --git a/lib/libunicode/Makefile.am b/lib/libunicode/Makefile.am deleted file mode 100644 index e1ac666a5..000000000 --- a/lib/libunicode/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -libunicode_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS) - -noinst_LTLIBRARIES += libunicode.la - -nodist_libunicode_la_SOURCES = \ - module/unicode/u8_textprep.c diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 8340fe2ef..c8c8adbb8 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -46,6 +46,8 @@ nodist_libzpool_la_SOURCES = \ \ module/os/linux/zfs/zio_crypt.c \ \ + module/unicode/u8_textprep.c \ + \ module/zcommon/cityhash.c \ module/zcommon/simd_stat.c \ module/zcommon/zfeature_common.c \ @@ -196,7 +198,6 @@ nodist_libzpool_la_SOURCES = \ libzpool_la_LIBADD = \ libicp.la \ - libunicode.la \ libnvpair.la \ libzstd.la \ libzutil.la