From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 879D7138334 for ; Mon, 15 Apr 2019 23:34:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D7EFE0A81; Mon, 15 Apr 2019 23:34:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C0BCE0A81 for ; Mon, 15 Apr 2019 23:34:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73A1C341335 for ; Mon, 15 Apr 2019 23:34:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BA23503 for ; Mon, 15 Apr 2019 23:33:59 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1555371227.6178799c7a4fbf3f648f93a7dff54f6b5b86737e.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-12.2.12-r1.ebuild X-VCS-Directories: sys-cluster/ceph/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 6178799c7a4fbf3f648f93a7dff54f6b5b86737e X-VCS-Branch: master Date: Mon, 15 Apr 2019 23:33:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 14257bd5-14dd-4648-bba3-287f4c8f9f3c X-Archives-Hash: 5fd342a455785fcbe9162ee9425ebe30 commit: 6178799c7a4fbf3f648f93a7dff54f6b5b86737e Author: Patrick McLean sony com> AuthorDate: Mon Apr 15 23:33:47 2019 +0000 Commit: Patrick McLean gentoo org> CommitDate: Mon Apr 15 23:33:47 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6178799c sys-cluster/ceph: Fixup for 12.2.12-r1, missed something in merging Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Patrick McLean gentoo.org> sys-cluster/ceph/ceph-12.2.12-r1.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild index b9a012001e4..24b436de237 100644 --- a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild +++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6}} ) DISTUTILS_OPTIONAL=1 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ @@ -141,6 +141,9 @@ 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"