From ff70433ccb238e0b5d360ab82e0502b2d392f8dc Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 10 Dec 2008 12:52:17 -0800 Subject: [PATCH] Strip umem related makefile, libumem now lives in the official upstream libumem portability library --- configure.ac | 3 -- zfs/lib/Makefile.in | 1 - zfs/lib/libumem/Makefile.in | 44 ------------------------- zfs/lib/libumem/include/Makefile.in | 2 -- zfs/lib/libumem/include/sys/Makefile.in | 1 - zfs/lib/libumem/zu.c | 4 --- zfs/zcmd/zdb/Makefile.in | 4 +-- zfs/zcmd/zdump/Makefile.in | 4 +-- zfs/zcmd/zfs/Makefile.in | 4 +-- zfs/zcmd/zinject/Makefile.in | 4 +-- zfs/zcmd/zpool/Makefile.in | 4 +-- zfs/zcmd/ztest/Makefile.in | 4 +-- 12 files changed, 6 insertions(+), 73 deletions(-) delete mode 100644 zfs/lib/libumem/Makefile.in delete mode 100644 zfs/lib/libumem/include/Makefile.in delete mode 100644 zfs/lib/libumem/include/sys/Makefile.in delete mode 100644 zfs/lib/libumem/zu.c diff --git a/configure.ac b/configure.ac index 0246baa787..48aeb949bc 100644 --- a/configure.ac +++ b/configure.ac @@ -117,9 +117,6 @@ AC_CONFIG_FILES([ Makefile zfs/lib/libuutil/Makefile zfs/lib/libzfs/include/Makefile zfs/lib/libzfs/Makefile - zfs/lib/libumem/include/Makefile - zfs/lib/libumem/include/sys/Makefile - zfs/lib/libumem/Makefile zfs/lib/libzcommon/include/Makefile zfs/lib/libzcommon/include/sys/fm/fs/Makefile zfs/lib/libzcommon/include/sys/fm/Makefile diff --git a/zfs/lib/Makefile.in b/zfs/lib/Makefile.in index 8e328ca2df..3a9a26ae19 100644 --- a/zfs/lib/Makefile.in +++ b/zfs/lib/Makefile.in @@ -1,5 +1,4 @@ subdir-m += libuutil # User space util support -subdir-m += libumem # User space memory support subdir-m += libzfs # User space library support subdir-m += libspl # User space compatibility library diff --git a/zfs/lib/libumem/Makefile.in b/zfs/lib/libumem/Makefile.in deleted file mode 100644 index 496668074d..0000000000 --- a/zfs/lib/libumem/Makefile.in +++ /dev/null @@ -1,44 +0,0 @@ -subdir-m += include -DISTFILES = envvar.c getpcstack.c init_lib.c init_stand.c linktest_stand.c -DISTFILES += malloc.c misc.c stub_stand.c umem.c umem_agent_support.c -DISTFILES += umem_fail.c umem_fork.c umem_update_thread.c vmem.c -DISTFILES += vmem_base.c vmem_mmap.c vmem_sbrk.c vmem_stand.c zu.c - -LIBRARY := libumem - -# 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@/libspl/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include - -HOSTLDFLAGS += -pthread -HOSTLDFLAGS += -ldl - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += envvar.o -${LIBRARY}-objs += getpcstack.o -${LIBRARY}-objs += init_lib.o -${LIBRARY}-objs += misc.o -${LIBRARY}-objs += umem.o -${LIBRARY}-objs += umem_agent_support.o -${LIBRARY}-objs += umem_fail.o -${LIBRARY}-objs += umem_fork.o -${LIBRARY}-objs += umem_update_thread.o -${LIBRARY}-objs += vmem.o -${LIBRARY}-objs += vmem_base.o -${LIBRARY}-objs += vmem_mmap.o -${LIBRARY}-objs += vmem_sbrk.o - -# Currently unused -# ${LIBRARY}-objs += init_stand.o -# ${LIBRARY}-objs += linktest_stand.o -# ${LIBRARY}-objs += malloc.o -# ${LIBRARY}-objs += stub_stand.o -# ${LIBRARY}-objs += vmem_stand.o diff --git a/zfs/lib/libumem/include/Makefile.in b/zfs/lib/libumem/include/Makefile.in deleted file mode 100644 index 1ea68cd14a..0000000000 --- a/zfs/lib/libumem/include/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -subdir-m += sys -DISTFILES = misc.h umem.h umem_base.h umem_impl.h vmem_base.h vmem_stand.h diff --git a/zfs/lib/libumem/include/sys/Makefile.in b/zfs/lib/libumem/include/sys/Makefile.in deleted file mode 100644 index eed2c31187..0000000000 --- a/zfs/lib/libumem/include/sys/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = vmem.h vmem_impl_user.h diff --git a/zfs/lib/libumem/zu.c b/zfs/lib/libumem/zu.c deleted file mode 100644 index 31dbf45bf9..0000000000 --- a/zfs/lib/libumem/zu.c +++ /dev/null @@ -1,4 +0,0 @@ -int main(void) -{ - return 0; -} diff --git a/zfs/zcmd/zdb/Makefile.in b/zfs/zcmd/zdb/Makefile.in index e558636c7a..bed5e2ce64 100644 --- a/zfs/zcmd/zdb/Makefile.in +++ b/zfs/zcmd/zdb/Makefile.in @@ -7,21 +7,19 @@ HOSTCFLAGS += -I@CMDDIR@/zdb/ HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libavl/include HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include HOSTCFLAGS += -I@LIBDIR@/libuutil/include HOSTCFLAGS += -I@LIBDIR@/libzcommon/include HOSTCFLAGS += -I@LIBDIR@/libzfs/include HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil 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@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs +export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs hostprogs-y := ${CMD} always := $(hostprogs-y) diff --git a/zfs/zcmd/zdump/Makefile.in b/zfs/zcmd/zdump/Makefile.in index b3d89cdbc3..af471a3eed 100644 --- a/zfs/zcmd/zdump/Makefile.in +++ b/zfs/zcmd/zdump/Makefile.in @@ -7,21 +7,19 @@ HOSTCFLAGS += -I@CMDDIR@/zdump/ HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libavl/include HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include HOSTCFLAGS += -I@LIBDIR@/libuutil/include HOSTCFLAGS += -I@LIBDIR@/libzcommon/include HOSTCFLAGS += -I@LIBDIR@/libzfs/include HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil 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@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs +export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs hostprogs-y := ${CMD} always := $(hostprogs-y) diff --git a/zfs/zcmd/zfs/Makefile.in b/zfs/zcmd/zfs/Makefile.in index 10e6cb5e05..06660597ce 100644 --- a/zfs/zcmd/zfs/Makefile.in +++ b/zfs/zcmd/zfs/Makefile.in @@ -7,21 +7,19 @@ HOSTCFLAGS += -I@CMDDIR@/zpool/ HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libavl/include HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include HOSTCFLAGS += -I@LIBDIR@/libuutil/include HOSTCFLAGS += -I@LIBDIR@/libzcommon/include HOSTCFLAGS += -I@LIBDIR@/libzfs/include HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil 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@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs +export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs hostprogs-y := ${CMD} always := $(hostprogs-y) diff --git a/zfs/zcmd/zinject/Makefile.in b/zfs/zcmd/zinject/Makefile.in index f5da6f4fbb..c93d03a7d5 100644 --- a/zfs/zcmd/zinject/Makefile.in +++ b/zfs/zcmd/zinject/Makefile.in @@ -7,21 +7,19 @@ HOSTCFLAGS += -I@CMDDIR@/zinject/ HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libavl/include HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include HOSTCFLAGS += -I@LIBDIR@/libuutil/include HOSTCFLAGS += -I@LIBDIR@/libzcommon/include HOSTCFLAGS += -I@LIBDIR@/libzfs/include HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil 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@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs +export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs hostprogs-y := ${CMD} always := $(hostprogs-y) diff --git a/zfs/zcmd/zpool/Makefile.in b/zfs/zcmd/zpool/Makefile.in index 4c221df53d..749e14dfff 100644 --- a/zfs/zcmd/zpool/Makefile.in +++ b/zfs/zcmd/zpool/Makefile.in @@ -7,21 +7,19 @@ HOSTCFLAGS += -I@CMDDIR@/zpool/ HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libavl/include HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include HOSTCFLAGS += -I@LIBDIR@/libuutil/include HOSTCFLAGS += -I@LIBDIR@/libzcommon/include HOSTCFLAGS += -I@LIBDIR@/libzfs/include HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil 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@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs +export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs hostprogs-y := ${CMD} always := $(hostprogs-y) diff --git a/zfs/zcmd/ztest/Makefile.in b/zfs/zcmd/ztest/Makefile.in index 25e9e2d62f..1ea28f27c9 100644 --- a/zfs/zcmd/ztest/Makefile.in +++ b/zfs/zcmd/ztest/Makefile.in @@ -7,21 +7,19 @@ HOSTCFLAGS += -I@CMDDIR@/ztest/ HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libavl/include HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include HOSTCFLAGS += -I@LIBDIR@/libuutil/include HOSTCFLAGS += -I@LIBDIR@/libzcommon/include HOSTCFLAGS += -I@LIBDIR@/libzfs/include HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil 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@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs +export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libuutil:@LIBDIR@/libspl:@LIBDIR@/libzcommon:@LIBDIR@/libzfs hostprogs-y := ${CMD} always := $(hostprogs-y)