From 1bd225ed8ae2fb60a7baf7dc0b121af28d4c443b Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Sat, 31 May 2025 06:38:20 +1000 Subject: [PATCH] abd_os: move headers from libzpool to libspl 5b9e695 added specific userspace versions of abd_os.h and abd_impl_os.h for libzpool. However, abd.h and abd_impl.h, which include them, are packaged with libzfs, so other programs building against libzfs can fail to build, either because the headers aren't installed, or because they aren't on any standard include path. So, move abd_os.h and abd_impl_os.h to libspl, where they we will be installed alongside abd.h and abd_impl.h in a known path. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Brian Behlendorf Signed-off-by: Rob Norris Closes #16940 Closes #17390 Closes #17394 --- config/Rules.am | 3 +-- lib/libspl/include/Makefile.am | 2 ++ lib/{libzpool => libspl}/include/sys/abd_impl_os.h | 0 lib/{libzpool => libspl}/include/sys/abd_os.h | 0 lib/libzpool/Makefile.am | 2 -- lib/libzpool/include/Makefile.am | 4 ---- 6 files changed, 3 insertions(+), 8 deletions(-) rename lib/{libzpool => libspl}/include/sys/abd_impl_os.h (100%) rename lib/{libzpool => libspl}/include/sys/abd_os.h (100%) delete mode 100644 lib/libzpool/include/Makefile.am diff --git a/config/Rules.am b/config/Rules.am index 9c0714c82..deffa352e 100644 --- a/config/Rules.am +++ b/config/Rules.am @@ -10,8 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/module/icp/include \ -I$(top_srcdir)/lib/libspl/include \ - -I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@ \ - -I$(top_srcdir)/lib/libzpool/include + -I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@ AM_LIBTOOLFLAGS = --silent diff --git a/lib/libspl/include/Makefile.am b/lib/libspl/include/Makefile.am index 4ad3b854c..8c286142f 100644 --- a/lib/libspl/include/Makefile.am +++ b/lib/libspl/include/Makefile.am @@ -24,6 +24,8 @@ libspl_rpc_HEADERS = \ libspl_sysdir = $(libspldir)/sys libspl_sys_HEADERS = \ + %D%/sys/abd_os.h \ + %D%/sys/abd_impl_os.h \ %D%/sys/acl.h \ %D%/sys/acl_impl.h \ %D%/sys/asm_linkage.h \ diff --git a/lib/libzpool/include/sys/abd_impl_os.h b/lib/libspl/include/sys/abd_impl_os.h similarity index 100% rename from lib/libzpool/include/sys/abd_impl_os.h rename to lib/libspl/include/sys/abd_impl_os.h diff --git a/lib/libzpool/include/sys/abd_os.h b/lib/libspl/include/sys/abd_os.h similarity index 100% rename from lib/libzpool/include/sys/abd_os.h rename to lib/libspl/include/sys/abd_os.h diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index 829d626d4..8553b377a 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -1,5 +1,3 @@ -include $(srcdir)/%D%/include/Makefile.am - libzpool_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS) libzpool_la_CFLAGS += $(ZLIB_CFLAGS) diff --git a/lib/libzpool/include/Makefile.am b/lib/libzpool/include/Makefile.am deleted file mode 100644 index 2e0c4c561..000000000 --- a/lib/libzpool/include/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -libzpooldir = $(includedir)/libzpool -libzpool_HEADERS = \ - %D%/sys/abd_os.h \ - %D%/sys/abd_impl_os.h