mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-06-25 02:28:01 +03:00
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 <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <rob.norris@klarasystems.com>
Closes #16940
Closes #17390
Closes #17394
This commit is contained in:
parent
008c9666ef
commit
1bd225ed8a
@ -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
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -1,5 +1,3 @@
|
||||
include $(srcdir)/%D%/include/Makefile.am
|
||||
|
||||
libzpool_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS)
|
||||
libzpool_la_CFLAGS += $(ZLIB_CFLAGS)
|
||||
|
||||
|
@ -1,4 +0,0 @@
|
||||
libzpooldir = $(includedir)/libzpool
|
||||
libzpool_HEADERS = \
|
||||
%D%/sys/abd_os.h \
|
||||
%D%/sys/abd_impl_os.h
|
Loading…
Reference in New Issue
Block a user