Merge commit 'refs/top-bases/linux-unused' into linux-unused
This commit is contained in:
commit
20e39fc8ba
|
@ -28,4 +28,4 @@ zdb_LDADD = \
|
||||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||||
$(top_builddir)/lib/libzfs/libzfs.la
|
$(top_builddir)/lib/libzfs/libzfs.la
|
||||||
|
|
||||||
zdb_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
|
zdb_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
|
||||||
|
|
|
@ -29,4 +29,4 @@ zfs_LDADD = \
|
||||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||||
$(top_builddir)/lib/libzfs/libzfs.la
|
$(top_builddir)/lib/libzfs/libzfs.la
|
||||||
|
|
||||||
zfs_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
|
zfs_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
|
||||||
|
|
|
@ -31,4 +31,4 @@ zinject_LDADD = \
|
||||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||||
$(top_builddir)/lib/libzfs/libzfs.la
|
$(top_builddir)/lib/libzfs/libzfs.la
|
||||||
|
|
||||||
zinject_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
|
zinject_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
|
||||||
|
|
|
@ -30,4 +30,4 @@ zpool_LDADD = \
|
||||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||||
$(top_builddir)/lib/libzfs/libzfs.la
|
$(top_builddir)/lib/libzfs/libzfs.la
|
||||||
|
|
||||||
zpool_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
|
zpool_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
|
||||||
|
|
|
@ -29,4 +29,4 @@ ztest_LDADD = \
|
||||||
$(top_builddir)/lib/libzpool/libzpool.la \
|
$(top_builddir)/lib/libzpool/libzpool.la \
|
||||||
$(top_builddir)/lib/libzfs/libzfs.la
|
$(top_builddir)/lib/libzfs/libzfs.la
|
||||||
|
|
||||||
ztest_LDFLAGS = -pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID)
|
ztest_LDFLAGS = -pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID) $(LIBBLKID)
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
dnl #
|
|
||||||
dnl # Check for libdiskmgt
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_USER_LIBDISKMGT], [
|
|
||||||
AC_CHECK_LIB([diskmgt], [libdiskmgt_error],
|
|
||||||
[AC_DEFINE([HAVE_LIBDISKMGT], 1,
|
|
||||||
[Define to 1 if 'libdiskmgt' library available])])
|
|
||||||
])
|
|
|
@ -13,6 +13,9 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_ZLIB], [
|
||||||
AC_CHECK_LIB([z], [uncompress], [], [AC_MSG_FAILURE([
|
AC_CHECK_LIB([z], [uncompress], [], [AC_MSG_FAILURE([
|
||||||
*** uncompress() missing, zlib-devel package required])])
|
*** uncompress() missing, zlib-devel package required])])
|
||||||
|
|
||||||
|
AC_CHECK_LIB([z], [crc32], [], [AC_MSG_FAILURE([
|
||||||
|
*** crc32() missing, zlib-devel package required])])
|
||||||
|
|
||||||
AC_SUBST([ZLIB], ["-lz"])
|
AC_SUBST([ZLIB], ["-lz"])
|
||||||
AC_DEFINE([HAVE_ZLIB], 1, [Define if you have zlib])
|
AC_DEFINE([HAVE_ZLIB], 1, [Define if you have zlib])
|
||||||
])
|
])
|
||||||
|
|
|
@ -3,7 +3,6 @@ dnl # Default ZFS user configuration
|
||||||
dnl #
|
dnl #
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_USER], [
|
AC_DEFUN([ZFS_AC_CONFIG_USER], [
|
||||||
ZFS_AC_CONFIG_USER_ARCH
|
ZFS_AC_CONFIG_USER_ARCH
|
||||||
ZFS_AC_CONFIG_USER_LIBDISKMGT
|
|
||||||
ZFS_AC_CONFIG_USER_LIBSHARE
|
ZFS_AC_CONFIG_USER_LIBSHARE
|
||||||
ZFS_AC_CONFIG_USER_IOCTL
|
ZFS_AC_CONFIG_USER_IOCTL
|
||||||
ZFS_AC_CONFIG_USER_ZLIB
|
ZFS_AC_CONFIG_USER_ZLIB
|
||||||
|
|
|
@ -42,7 +42,7 @@ various system profiling tools to facilitate an in depth analysis.
|
||||||
%prep
|
%prep
|
||||||
%setup
|
%setup
|
||||||
%build
|
%build
|
||||||
%configure --with-config=user
|
%configure --with-config=user --with-blkid
|
||||||
make
|
make
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
Loading…
Reference in New Issue