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 5D336138334 for ; Wed, 12 Jun 2019 21:16:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A6D5E08DD; Wed, 12 Jun 2019 21:16:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 E0B48E08DD for ; Wed, 12 Jun 2019 21:16:33 +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 EDA27345F98 for ; Wed, 12 Jun 2019 21:16:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F2F55BD for ; Wed, 12 Jun 2019 21:16:30 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <1560374180.c234db0293d0ffe7b8b9e7e1892c50aa68b19028.jsbronder@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/hwloc/Manifest sys-apps/hwloc/hwloc-1.11.10.ebuild X-VCS-Directories: sys-apps/hwloc/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: c234db0293d0ffe7b8b9e7e1892c50aa68b19028 X-VCS-Branch: master Date: Wed, 12 Jun 2019 21:16:30 +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: 744454b7-479b-44d9-aa77-52b78cd467c9 X-Archives-Hash: 649bbf373c65cf48848dcf4d342de01c commit: c234db0293d0ffe7b8b9e7e1892c50aa68b19028 Author: Justin Bronder gentoo org> AuthorDate: Wed Jun 12 21:14:39 2019 +0000 Commit: Justin Bronder gentoo org> CommitDate: Wed Jun 12 21:16:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c234db02 Partial Revert "sys-apps/hwloc: cleanup old" This reverts commit de690876c21341951f7fa9aef5e66c26222862dd as I didn't noticed that arm64 alone had marked 1.11.10 as stable. Signed-off-by: Justin Bronder gentoo.org> sys-apps/hwloc/Manifest | 1 + sys-apps/hwloc/hwloc-1.11.10.ebuild | 70 +++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest index a0b1ddc5070..8d842bb46d7 100644 --- a/sys-apps/hwloc/Manifest +++ b/sys-apps/hwloc/Manifest @@ -1,3 +1,4 @@ +DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138 DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild new file mode 100644 index 00000000000..e2f6d1687b8 --- /dev/null +++ b/sys-apps/hwloc/hwloc-1.11.10.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools cuda flag-o-matic versionator multilib-minimal + +MY_PV=v$(get_version_component_range 1-2) + +DESCRIPTION="displays the hardware topology in convenient formats" +HOMEPAGE="http://www.open-mpi.org/projects/hwloc/" +SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X" + +# opencl support dropped with x11-drivers/ati-drivers being removed (#582406). +# Anyone with hardware is welcome to step up and help test to get it re-added. + +# dev-util/nvidia-cuda-toolkit is always multilib + +RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] + cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] ) + cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) + gl? ( x11-drivers/nvidia-drivers[static-libs,tools] ) + pci? ( + >=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}] + >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] + ) + plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] ) + numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] ) + xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) +DOCS=( AUTHORS NEWS README VERSION ) + +src_prepare() { + default + eautoreconf + + if use cuda ; then + append-cflags -I"${EPREFIX}"/opt/cuda/include + append-cppflags -I"${EPREFIX}"/opt/cuda/include + fi +} + +multilib_src_configure() { + export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 + + if use cuda ; then + local -x LDFLAGS="${LDFLAGS}" + append-ldflags -L"${EPREFIX}"/opt/cuda/$(get_libdir) + fi + + ECONF_SOURCE=${S} econf \ + $(use_enable static-libs static) \ + $(use_enable cairo) \ + $(multilib_native_use_enable cuda) \ + $(use_enable debug) \ + $(multilib_native_use_enable gl) \ + $(use_enable pci) \ + $(use_enable plugins) \ + $(use_enable numa libnuma) \ + $(use_enable xml libxml2) \ + $(use_with X x) +}