commit: afb63b906bf1cba90a8f9d4a651174ad973ee422
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 7 06:42:45 2016 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Jun 7 06:44:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb63b90
sys-cluster/ceph: correct zfs PKG_CONFIG's variable
Gentoo-Bug: 585050
Package-Manager: portage-2.3.0_rc1
sys-cluster/ceph/ceph-10.2.1.ebuild | 3 ++-
sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch | 11 +++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/ceph/ceph-10.2.1.ebuild
b/sys-cluster/ceph/ceph-10.2.1.ebuild
index ab79bf3..1ab15d9 100644
--- 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
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" ])
