Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zpios' into linux-zpios

This commit is contained in:
Brian Behlendorf 2008-12-05 14:23:06 -08:00
parent 9ed7c9b6ad 18266508c7
commit c0b45720fc
20 changed files with 41 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/kernel.m4
View File

@ -46,7 +46,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
dnl # investigation and I don't have the time now.
echo "creating symlinks for additional kernel make targets"
ln -f -s $LIBDIR/libport/u8_textprep.c $LIBDIR/libport/ku8_textprep.c
ln -f -s $LIBDIR/libavl/avl.c $LIBDIR/libavl/kavl.c
ln -f -s $LIBDIR/libavl/avl.c $LIBDIR/libavl/uavl.c
ln -f -s $LIBDIR/libnvpair/nvpair.c $LIBDIR/libnvpair/knvpair.c
@ -54,8 +53,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
ln -f -s $LIBDIR/libzcommon/zfs_deleg.c $LIBDIR/libzcommon/kzfs_deleg.c
ln -f -s $LIBDIR/libzcommon/zfs_prop.c $LIBDIR/libzcommon/kzfs_prop.c
ln -f -s $LIBDIR/libzcommon/zprop_common.c $LIBDIR/libzcommon/kzprop_common.c
ln -f -s $LIBDIR/libzcommon/compress.c $LIBDIR/libzcommon/kcompress.c
ln -f -s $LIBDIR/libzcommon/list.c $LIBDIR/libzcommon/klist.c
ln -f -s $LIBDIR/libzcommon/zfs_namecheck.c $LIBDIR/libzcommon/kzfs_namecheck.c
ln -f -s $LIBDIR/libzcommon/zfs_comutil.c $LIBDIR/libzcommon/kzfs_comutil.c
ln -f -s $LIBDIR/libzcommon/zpool_prop.c $LIBDIR/libzcommon/kzpool_prop.c

5
scripts/load-zfs.sh
View File

@ -10,7 +10,6 @@ spl_module=${SPLBUILD}/modules/spl/spl.ko
zlib_module=/lib/modules/${KERNELSRCVER}/kernel/lib/zlib_deflate/zlib_deflate.ko
zavl_module=${ZFSBUILD}/lib/libavl/zavl.ko
znvpair_module=${ZFSBUILD}/lib/libnvpair/znvpair.ko
zport_module=${ZFSBUILD}/lib/libport/zport.ko
zcommon_module=${ZFSBUILD}/lib/libzcommon/zcommon.ko
zpool_module=${ZFSBUILD}/lib/libzpool/zpool.ko
zctl_module=${ZFSBUILD}/lib/libdmu-ctl/zctl.ko
@ -30,13 +29,12 @@ if [ $(id -u) != 0 ]; then
die "Must run as root"
fi
if /sbin/lsmod | egrep -q "^spl|^zavl|^znvpair|^zport|^zcommon|^zlib_deflate|^zpool"; then
if /sbin/lsmod | egrep -q "^spl|^zavl|^znvpair|^zcommon|^zlib_deflate|^zpool"; then
die "Must start with modules unloaded"
fi
if [ ! -f ${zavl_module} ] ||
[ ! -f ${znvpair_module} ] ||
[ ! -f ${zport_module} ] ||
[ ! -f ${zcommon_module} ] ||
[ ! -f ${zpool_module} ]; then
die "Source tree must be built, run 'make'"
@ -46,7 +44,6 @@ load_module ${spl_module} ${spl_options}
load_module ${zlib_module}
load_module ${zavl_module}
load_module ${znvpair_module}
load_module ${zport_module}
load_module ${zcommon_module}
load_module ${zpool_module} ${zpool_options}
load_module ${zctl_module}

2
scripts/unload-zfs.sh
View File

@ -7,7 +7,6 @@ spl_module=${SPLBUILD}/modules/spl/spl.ko
zlib_module=/lib/modules/${KERNELSRCVER}/kernel/lib/zlib_deflate/zlib_deflate.ko
zavl_module=${ZFSBUILD}/lib/libavl/zavl.ko
znvpair_module=${ZFSBUILD}/lib/libnvpair/znvpair.ko
zport_module=${ZFSBUILD}/lib/libport/zport.ko
zcommon_module=${ZFSBUILD}/lib/libzcommon/zcommon.ko
zpool_module=${ZFSBUILD}/lib/libzpool/zpool.ko
zctl_module=${ZFSBUILD}/lib/libdmu-ctl/zctl.ko
@ -31,7 +30,6 @@ unload_module ${zpios_module}
unload_module ${zctl_module}
unload_module ${zpool_module}
unload_module ${zcommon_module}
unload_module ${zport_module}
unload_module ${znvpair_module}
unload_module ${zavl_module}
unload_module ${zlib_module}

3
zfs/lib/libavl/Makefile.in
View File

@ -19,8 +19,7 @@ ${MODULE}-objs += kavl.o # Generic AVL support
# the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
hostprogs-y := zu

3
zfs/lib/libnvpair/Makefile.in
View File

@ -20,8 +20,7 @@ ${MODULE}-objs += nvpair_alloc_spl.o # Generic alloc/free support
# the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
hostprogs-y := zu

4
zfs/lib/libport/include/Makefile.in
View File

@ -1,4 +0,0 @@
subdir-m += sys
DISTFILES = fake_ioctl.h libdiskmgt.h libshare.h mntent.h stdlib.h
DISTFILES += string.h strings.h stropts.h unistd.h

3
zfs/lib/libport/include/sys/Makefile.in
View File

@ -1,3 +0,0 @@
DISTFILES = byteorder.h debug.h efi_partition.h ioctl.h isa_defs.h
DISTFILES += policy.h socket.h swap.h systeminfo.h systm.h time.h
DISTFILES += types.h u8_textprep.h u8_textprep_data.h

25
zfs/lib/libport/Makefile.in → zfs/lib/libspl/Makefile.in
View File

@ -1,37 +1,28 @@
subdir-m += include
DISTFILES = port.c strlcat.c strlcpy.c strnlen.c u8_textprep.c
DISTFILES = kernel.c mkdirp.c strlcpy.c taskq.c util.c
DISTFILES += list.c strlcat.c strnlen.c u8_textprep.c
MODULE := zport
LIBRARY := libzport
# Compile as kernel module. Needed symlinks created for all
# k* objects created by top level configure script.
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
EXTRA_CFLAGS += -I@LIBDIR@/libport/include
obj-m := ${MODULE}.o
${MODULE}-objs += spl.o
${MODULE}-objs += ku8_textprep.o
# Compile as shared library. There's an extra useless host program
# here called 'zu' because it was the easiest way I could convince
# the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
hostprogs-y := zu
always := $(hostprogs-y)
zu-objs := zu.o ${LIBRARY}.so
${LIBRARY}-objs += kernel.o
${LIBRARY}-objs += mkdirp.o
${LIBRARY}-objs += strlcpy.o
${LIBRARY}-objs += taskq.o
${LIBRARY}-objs += util.o
${LIBRARY}-objs += list.o
${LIBRARY}-objs += strlcat.o
${LIBRARY}-objs += strnlen.o
${LIBRARY}-objs += port.o
${LIBRARY}-objs += u8_textprep.o

1
zfs/lib/libspl/include/Makefile.in Normal file
View File

@ -0,0 +1 @@
subdir-m += sys

1
zfs/lib/libspl/include/sys/Makefile.in Normal file
View File

@ -0,0 +1 @@
DISTFILES = list.h list_impl.h vmem.h zfs_context.h

5
zfs/lib/libuutil/Makefile.in
View File

@ -8,8 +8,7 @@ LIBRARY := libuutil
# the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
HOSTCFLAGS += -I@LIBDIR@/libuutil/include
HOSTCFLAGS += -DNATIVE_BUILD
@ -17,7 +16,7 @@ HOSTCFLAGS += -DNATIVE_BUILD
HOSTLDFLAGS += -pthread
HOSTLDFLAGS += -lrt
HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
hostprogs-y := zu
always := $(hostprogs-y)

12
zfs/lib/libzcommon/Makefile.in
View File

@ -1,5 +1,5 @@
subdir-m += include
DISTFILES = compress.c list.c zfs_comutil.c zfs_deleg.c zfs_namecheck.c
DISTFILES = zfs_comutil.c zfs_deleg.c zfs_namecheck.c
DISTFILES += zfs_prop.c zpool_prop.c zprop_common.c
MODULE := zcommon
@ -10,7 +10,7 @@ LIBRARY := libzcommon
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
EXTRA_CFLAGS += -I@LIBDIR@/libport/include
EXTRA_CFLAGS += -I@LIBDIR@/libspl/include
EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include
@ -20,8 +20,6 @@ ${MODULE}-objs += spl.o
${MODULE}-objs += kzfs_deleg.o
${MODULE}-objs += kzfs_prop.o
${MODULE}-objs += kzprop_common.o
${MODULE}-objs += kcompress.o
${MODULE}-objs += klist.o
${MODULE}-objs += kzfs_namecheck.o
${MODULE}-objs += kzfs_comutil.o
${MODULE}-objs += kzpool_prop.o
@ -31,9 +29,7 @@ ${MODULE}-objs += kzpool_prop.o
# the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
HOSTCFLAGS += -I@LIBDIR@/libumem/include
@ -48,8 +44,6 @@ zu-objs := zu.o ${LIBRARY}.so
${LIBRARY}-objs += zfs_deleg.o
${LIBRARY}-objs += zfs_prop.o
${LIBRARY}-objs += zprop_common.o
${LIBRARY}-objs += compress.o
${LIBRARY}-objs += list.o
${LIBRARY}-objs += zfs_namecheck.o
${LIBRARY}-objs += zfs_comutil.o
${LIBRARY}-objs += zpool_prop.o

6
zfs/lib/libzfs/Makefile.in
View File

@ -11,8 +11,7 @@ LIBRARY := libzfs
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libzfs/include
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libumem/include
HOSTCFLAGS += -I@LIBDIR@/libuutil/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
@ -24,9 +23,8 @@ HOSTCFLAGS += -I@LIBDIR@/libzpool # For existing fletcher.c hack
HOSTLDFLAGS += -ldl -lm
HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
hostprogs-y := zu

11
zfs/lib/libzpool/Makefile.in
View File

@ -1,14 +1,10 @@
# NOTE: kernel.c, taskq.c, util.c unused by kernel port.
# Potentially they should just be removed if we don't care
# able user space lustre intergration from this source base.
DISTFILES = arc.c bplist.c dbuf.c dmu.c dmu_object.c dmu_objset.c
DISTFILES += dmu_traverse.c dmu_tx.c dmu_zfetch.c dnode.c dnode_sync.c
DISTFILES += dsl_dataset.c dsl_deleg.c dsl_dir.c dsl_pool.c dsl_prop.c
DISTFILES += dsl_synctask.c fletcher.c gzip.c kernel.c lzjb.c metaslab.c
DISTFILES += dsl_synctask.c fletcher.c gzip.c lzjb.c metaslab.c
DISTFILES += refcount.c sha256.c spa.c spa_boot.c spa_config.c spa_errlog.c
DISTFILES += spa_history.c spa_misc.c space_map.c taskq.c txg.c uberblock.c
DISTFILES += unique.c util.c vdev.c vdev_cache.c vdev_disk.c vdev_missing.c
DISTFILES += spa_history.c spa_misc.c space_map.c txg.c uberblock.c
DISTFILES += unique.c vdev.c vdev_cache.c vdev_disk.c vdev_missing.c
DISTFILES += vdev_file.c vdev_label.c vdev_mirror.c vdev_queue.c vdev_raidz.c
DISTFILES += vdev_root.c zap.c zap_leaf.c zap_micro.c zfs_byteswap.c zfs_fm.c
DISTFILES += zfs_znode.c zil.c zio.c zio_checksum.c zio_compress.c zio_inject.c
@ -17,7 +13,6 @@ MODULE := zpool
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include
EXTRA_CFLAGS += -I@LIBDIR@/libport/include
EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include

8
zfs/zcmd/zdb/Makefile.in
View File

@ -4,8 +4,7 @@ CMD := zdb
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@CMDDIR@/zdb/
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
HOSTCFLAGS += -I@LIBDIR@/libumem/include
@ -17,13 +16,12 @@ HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
# Additional shared library paths for executing binaries in-tree
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
hostprogs-y := ${CMD}
always := $(hostprogs-y)

8
zfs/zcmd/zdump/Makefile.in
View File

@ -4,8 +4,7 @@ CMD := zdump
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@CMDDIR@/zdump/
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
HOSTCFLAGS += -I@LIBDIR@/libumem/include
@ -17,13 +16,12 @@ HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
# Additional shared library paths for executing binaries in-tree
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
hostprogs-y := ${CMD}
always := $(hostprogs-y)

8
zfs/zcmd/zfs/Makefile.in
View File

@ -4,8 +4,7 @@ CMD := zfs
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@CMDDIR@/zpool/
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
HOSTCFLAGS += -I@LIBDIR@/libumem/include
@ -17,13 +16,12 @@ HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
# Additional shared library paths for executing binaries in-tree
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
hostprogs-y := ${CMD}
always := $(hostprogs-y)

8
zfs/zcmd/zinject/Makefile.in
View File

@ -4,8 +4,7 @@ CMD := zinject
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@CMDDIR@/zinject/
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
HOSTCFLAGS += -I@LIBDIR@/libumem/include
@ -17,13 +16,12 @@ HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
# Additional shared library paths for executing binaries in-tree
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
hostprogs-y := ${CMD}
always := $(hostprogs-y)

8
zfs/zcmd/zpool/Makefile.in
View File

@ -4,8 +4,7 @@ CMD := zpool
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@CMDDIR@/zpool/
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
HOSTCFLAGS += -I@LIBDIR@/libumem/include
@ -17,13 +16,12 @@ HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
# Additional shared library paths for executing binaries in-tree
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
hostprogs-y := ${CMD}
always := $(hostprogs-y)

8
zfs/zcmd/ztest/Makefile.in
View File

@ -4,8 +4,7 @@ CMD := ztest
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@CMDDIR@/ztest/
HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include
HOSTCFLAGS += -I@LIBDIR@/libport/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
HOSTCFLAGS += -I@LIBDIR@/libumem/include
@ -17,13 +16,12 @@ HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
HOSTLDFLAGS += -lzport -L@LIBDIR@/libport
HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat
HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
# Additional shared library paths for executing binaries in-tree
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs
hostprogs-y := ${CMD}
always := $(hostprogs-y)