sys-cluster/ceph: correct zfs PKG_CONFIG's variable

Gentoo-Bug: 585050

Package-Manager: portage-2.3.0_rc1

diff --git a/sys-cluster/ceph/ceph-10.2.1.ebuild b/sys-cluster/ceph/ceph-10.2.1.ebuild
index ab79bf341a046210093e9aeb7a0894f51c142cbc..1ab15d9a79b8d2230bd0f8791d35481f7656648a 100644 (file)
--- a/sys-cluster/ceph/ceph-10.2.1.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.1.ebuild
@@ -111,7 +111,8 @@ UNBUNDLE_LIBS=(
 PATCHES=(
        "${FILESDIR}/ceph-10.2.0-dont-use-virtualenvs.patch"
        #"${FILESDIR}/ceph-10.2.1-unbundle-jerasure.patch"
-       "${FILESDIR}/ceph-10.2.1-armv7l-doesnt-support-momit-leaf-frame-pointer.patch"
+       "${FILESDIR}/${P}-libzfs.patch"
+       "${FILESDIR}/${P}-armv7l-doesnt-support-momit-leaf-frame-pointer.patch"
 )
 
 check-reqs_export_vars() {

diff --git a/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch b/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch
new file mode 100644 (file)
index 0000000..34f8eb8
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch
@@ -0,0 +1,11 @@
+--- ceph-10.2.1/configure.ac
++++ ceph-10.2.1/configure.ac
+@@ -908,7 +908,7 @@
+           ,
+           [with_libzfs=no])
+ AS_IF([test "x$with_libzfs" = xyes],
+-          [PKG_CHECK_MODULES([LIBZFS], [zfs], [], [true])])
++          [PKG_CHECK_MODULES([LIBZFS], [libzfs], [], [true])])
+ AS_IF([test "x$with_libzfs" = xyes],
+           [AC_DEFINE([HAVE_LIBZFS], [1], [Defined if you have libzfs enabled])])
+ AM_CONDITIONAL(WITH_LIBZFS, [ test "$with_libzfs" = "yes" ])