u8_textprep: move into module/zfs

Now that it's built into the main zfs module in all cases, there's no
reason to put it in its own dir.

Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #18071
This commit is contained in:
Rob Norris 2025-12-20 11:52:18 +11:00 committed by Brian Behlendorf
parent 309006a0c6
commit 654e7628d6
4 changed files with 3 additions and 11 deletions

View File

@ -46,8 +46,6 @@ nodist_libzpool_la_SOURCES = \
\ \
module/os/linux/zfs/zio_crypt.c \ module/os/linux/zfs/zio_crypt.c \
\ \
module/unicode/u8_textprep.c \
\
module/zcommon/cityhash.c \ module/zcommon/cityhash.c \
module/zcommon/simd_stat.c \ module/zcommon/simd_stat.c \
module/zcommon/zfeature_common.c \ module/zcommon/zfeature_common.c \
@ -137,6 +135,7 @@ nodist_libzpool_la_SOURCES = \
module/zfs/space_map.c \ module/zfs/space_map.c \
module/zfs/space_reftree.c \ module/zfs/space_reftree.c \
module/zfs/txg.c \ module/zfs/txg.c \
module/zfs/u8_textprep.c \
module/zfs/uberblock.c \ module/zfs/uberblock.c \
module/zfs/unique.c \ module/zfs/unique.c \
module/zfs/vdev.c \ module/zfs/vdev.c \

View File

@ -216,12 +216,6 @@ NVPAIR_OBJS := \
zfs-objs += $(addprefix nvpair/,$(NVPAIR_OBJS)) zfs-objs += $(addprefix nvpair/,$(NVPAIR_OBJS))
UNICODE_OBJS := \
u8_textprep.o
zfs-objs += $(addprefix unicode/,$(UNICODE_OBJS))
ZCOMMON_OBJS := \ ZCOMMON_OBJS := \
cityhash.o \ cityhash.o \
simd_stat.o \ simd_stat.o \
@ -372,6 +366,7 @@ ZFS_OBJS := \
space_map.o \ space_map.o \
space_reftree.o \ space_reftree.o \
txg.o \ txg.o \
u8_textprep.o \
uberblock.o \ uberblock.o \
unique.o \ unique.o \
vdev.o \ vdev.o \

View File

@ -230,9 +230,6 @@ SRCS+= abd_os.c \
zio_crypt.c \ zio_crypt.c \
zvol_os.c zvol_os.c
#unicode
SRCS+= u8_textprep.c
#zcommon #zcommon
SRCS+= cityhash.c \ SRCS+= cityhash.c \
zfeature_common.c \ zfeature_common.c \
@ -322,6 +319,7 @@ SRCS+= abd.c \
spa_misc.c \ spa_misc.c \
spa_stats.c \ spa_stats.c \
txg.c \ txg.c \
u8_textprep.c \
uberblock.c \ uberblock.c \
unique.c \ unique.c \
vdev.c \ vdev.c \