diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2016-06-07 14:42:45 +0800 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2016-06-07 14:44:36 +0800 |
| commit | afb63b906bf1cba90a8f9d4a651174ad973ee422 (patch) | |
| tree | b0bc77261321998e041a2857f32bfced9686a7e0 /sys-cluster/ceph | |
| parent | x11-plugins/gkrellm-cpupower: Initial commit. (diff) | |
| download | gentoo-afb63b906bf1cba90a8f9d4a651174ad973ee422.tar.gz gentoo-afb63b906bf1cba90a8f9d4a651174ad973ee422.tar.bz2 gentoo-afb63b906bf1cba90a8f9d4a651174ad973ee422.zip | |
sys-cluster/ceph: correct zfs PKG_CONFIG's variable
Gentoo-Bug: 585050
Package-Manager: portage-2.3.0_rc1
Diffstat (limited to 'sys-cluster/ceph')
| -rw-r--r-- | sys-cluster/ceph/ceph-10.2.1.ebuild | 3 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-10.2.1-libzfs.patch | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/sys-cluster/ceph/ceph-10.2.1.ebuild b/sys-cluster/ceph/ceph-10.2.1.ebuild index ab79bf341a04..1ab15d9a79b8 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 000000000000..34f8eb84beee --- /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" ]) |