Skip to content

Commit 1bd225e

Browse files
authored
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 <[email protected]> Signed-off-by: Rob Norris <[email protected]> Closes #16940 Closes #17390 Closes #17394
1 parent 008c966 commit 1bd225e

File tree

6 files changed

+3
-8
lines changed

6 files changed

+3
-8
lines changed

config/Rules.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ AM_CPPFLAGS = \
1010
-I$(top_srcdir)/include \
1111
-I$(top_srcdir)/module/icp/include \
1212
-I$(top_srcdir)/lib/libspl/include \
13-
-I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@ \
14-
-I$(top_srcdir)/lib/libzpool/include
13+
-I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@
1514

1615
AM_LIBTOOLFLAGS = --silent
1716

lib/libspl/include/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ libspl_rpc_HEADERS = \
2424

2525
libspl_sysdir = $(libspldir)/sys
2626
libspl_sys_HEADERS = \
27+
%D%/sys/abd_os.h \
28+
%D%/sys/abd_impl_os.h \
2729
%D%/sys/acl.h \
2830
%D%/sys/acl_impl.h \
2931
%D%/sys/asm_linkage.h \
File renamed without changes.

lib/libzpool/Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include $(srcdir)/%D%/include/Makefile.am
2-
31
libzpool_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS)
42
libzpool_la_CFLAGS += $(ZLIB_CFLAGS)
53

lib/libzpool/include/Makefile.am

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)