From: Patrick McLean Date: Mon, 15 Apr 2019 23:35:28 +0000 (-0700) Subject: sys-cluster/ceph: Another merge issue X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4bc040f0ae3b7c98d4c7fdb525f49b5a29f7e2df;p=gentoo.git sys-cluster/ceph: Another merge issue Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Patrick McLean --- diff --git a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild index 24b436de2373..5a7ad336c75c 100644 --- a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild +++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild @@ -141,9 +141,6 @@ PATCHES=( "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" ) -# dpdk and ninja don't get along -CMAKE_MAKEFILE_GENERATOR="emake" - check-reqs_export_vars() { if use amd64; then CHECKREQS_DISK_BUILD="12G"