commit: 9041a0afd7140b72153bcbfa9997ccb0db87bef5 Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> AuthorDate: Tue Feb 17 00:00:45 2015 +0000 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> CommitDate: Tue Feb 17 00:00:45 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9041a0af
added as deps for multilib mpi Package-Manager: portage-2.2.14 --- sys-apps/hwloc/ChangeLog | 218 ++++++++++++++++++++++++++++++ sys-apps/hwloc/files/hwloc-1.8.1-gl.patch | 11 ++ sys-apps/hwloc/hwloc-1.10.0-r2.ebuild | 68 ++++++++++ sys-apps/hwloc/metadata.xml | 21 +++ 4 files changed, 318 insertions(+) diff --git a/sys-apps/hwloc/ChangeLog b/sys-apps/hwloc/ChangeLog new file mode 100644 index 0000000..ef85758 --- /dev/null +++ b/sys-apps/hwloc/ChangeLog @@ -0,0 +1,218 @@ +# ChangeLog for sys-apps/hwloc +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/ChangeLog,v 1.49 2015/01/05 17:56:52 aballier Exp $ + + 05 Jan 2015; Alexis Ballier <aball...@gentoo.org> hwloc-1.10.0-r1.ebuild: + keyword ~arm + +*hwloc-1.10.0-r1 (06 Nov 2014) + + 06 Nov 2014; Mike Frysinger <vap...@gentoo.org> +hwloc-1.10.0-r1.ebuild: + Depend on libltdl rather than libtool #528294 by Pacho Ramos. + +*hwloc-1.10.0 (16 Oct 2014) + + 16 Oct 2014; Justin Bronder <jsbron...@gentoo.org> +hwloc-1.10.0.ebuild: + bump, working with mpich2-1.5 and openmpi-1.8.3. + +*hwloc-1.9 (08 Apr 2014) + + 08 Apr 2014; Alexey Shvetsov <ale...@gentoo.org> +hwloc-1.9.ebuild, + -hwloc-1.4.2.ebuild, -hwloc-1.5.ebuild: + [sys-apps/hwloc] Version bump + + 17 Mar 2014; Kacper Kowalik <xarthis...@gentoo.org> metadata.xml: + Remove myself from metadata.xml + + 28 Feb 2014; Sébastien Fabbro <bicat...@gentoo.org> + +files/hwloc-1.8.1-gl.patch, hwloc-1.8.1.ebuild: + Fixed underlinking for gl flag, thanks Andrew Savchenko bug #502956 + +*hwloc-1.8.1 (16 Feb 2014) + + 16 Feb 2014; Sébastien Fabbro <bicat...@gentoo.org> +hwloc-1.8.1.ebuild, + metadata.xml: + Version bump. Fixes bug #499618 by <teidakan...@gmail.com> + + 19 Jan 2014; Agostino Sarubbo <a...@gentoo.org> hwloc-1.6.1.ebuild: + Stable for alpha, wrt bug #484320 + + 12 Jan 2014; Agostino Sarubbo <a...@gentoo.org> hwloc-1.6.1.ebuild: + Stable for ia64, wrt bug #484320 + + 05 Jan 2014; Agostino Sarubbo <a...@gentoo.org> hwloc-1.6.1.ebuild: + Stable for sparc, wrt bug #484320 + + 16 Nov 2013; Kacper Kowalik <xarthis...@gentoo.org> hwloc-1.7.2.ebuild: + whitespace + +*hwloc-1.7.2 (16 Nov 2013) + + 16 Nov 2013; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.7.2.ebuild, + -hwloc-1.7.1.ebuild: + Version bump, drop old. Fixes #480642 by Juergen Rose <r...@rz.uni- + potsdam.de>. Thanks to LE GARREC Vincent <legarrec.vinc...@gmail.com> and + Charlie Gehlin <char...@gehlin.com> for their help. + +*hwloc-1.7.1 (09 Aug 2013) + + 09 Aug 2013; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.7.1.ebuild, + metadata.xml: + Version bump wrt #469708 by Mario Kicherer <d...@kicherer.org> + +*hwloc-1.6.2 (21 Mar 2013) + + 21 Mar 2013; Alexey Shvetsov <ale...@gentoo.org> +hwloc-1.6.2.ebuild: + Version bump for 1.6 series + + 28 Feb 2013; Jeroen Roovers <j...@gentoo.org> hwloc-1.6.1.ebuild: + Stable for HPPA (bug #458206). + + 23 Feb 2013; Agostino Sarubbo <a...@gentoo.org> hwloc-1.6.1.ebuild: + Stable for ppc64, wrt bug #458206 + + 22 Feb 2013; Agostino Sarubbo <a...@gentoo.org> hwloc-1.6.1.ebuild: + Stable for ppc, wrt bug #458206 + + 20 Feb 2013; Agostino Sarubbo <a...@gentoo.org> hwloc-1.6.1.ebuild: + Stable for x86, wrt bug #458206 + + 20 Feb 2013; Agostino Sarubbo <a...@gentoo.org> hwloc-1.6.1.ebuild: + Stable for amd64, wrt bug #458206 + +*hwloc-1.4.2 (18 Feb 2013) + + 18 Feb 2013; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.4.2.ebuild: + Restore last available version from 1.4 branch as it is required for sys- + cluster/mpich2-1.4.1_p1. Thanks to Michael Sterrett <mr_bon...@gentoo.org> for + cathing this + +*hwloc-1.6.1 (18 Jan 2013) + + 18 Jan 2013; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.6.1.ebuild, + -hwloc-1.3.1.ebuild, -hwloc-1.3.2.ebuild, -hwloc-1.4.1.ebuild, + -hwloc-1.4.2.ebuild, -hwloc-1.6.ebuild: + Version bump, drop old + +*hwloc-1.6 (06 Dec 2012) + + 06 Dec 2012; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.6.ebuild, + metadata.xml: + Version bump + +*hwloc-1.5 (07 Oct 2012) + + 07 Oct 2012; Alexey Shvetsov <ale...@gentoo.org> +hwloc-1.5.ebuild: + [sys-apps/hwloc] Version bump + + 30 May 2012; Alexis Ballier <aball...@gentoo.org> hwloc-1.4.2.ebuild: + keyword ~amd64-fbsd + +*hwloc-1.4.2 (11 May 2012) + + 11 May 2012; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.4.2.ebuild, + -hwloc-1.4.ebuild: + Version bump, drop old + + 04 May 2012; Jeff Horelick <jdh...@gentoo.org> hwloc-1.3.1.ebuild, + hwloc-1.3.2.ebuild, hwloc-1.4.ebuild, hwloc-1.4.1.ebuild: + dev-util/pkgconfig -> virtual/pkgconfig + +*hwloc-1.3.2 (05 Mar 2012) +*hwloc-1.4.1 (05 Mar 2012) + + 05 Mar 2012; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.3.2.ebuild, + +hwloc-1.4.1.ebuild: + Version bump + + 10 Feb 2012; Kacper Kowalik <xarthis...@gentoo.org> hwloc-1.4.ebuild: + Add actual use_enable for numa + +*hwloc-1.4 (26 Jan 2012) + + 26 Jan 2012; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.4.ebuild: + Version bump + + 13 Jan 2012; Mike Frysinger <vap...@gentoo.org> hwloc-1.3.1.ebuild: + Use common tc-getPKG_CONFIG helper. + +*hwloc-1.3.1 (21 Dec 2011) + + 21 Dec 2011; Kacper Kowalik <xarthis...@gentoo.org> -hwloc-1.2.1.ebuild, + -hwloc-1.3.ebuild, +hwloc-1.3.1.ebuild: + Version bump, drop old + + 07 Dec 2011; Nathan Phillip Brink <bi...@gentoo.org> hwloc-1.2.1.ebuild, + hwloc-1.3.ebuild: + Force hwloc's ./configure to respect PKG_CONFIG, fixes bug #393467 and some + portage-multilib compat. + +*hwloc-1.3 (20 Nov 2011) + + 20 Nov 2011; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.3.ebuild, + -hwloc-1.1.1-r1.ebuild, -hwloc-1.2-r1.ebuild, -hwloc-1.2.ebuild, metadata.xml: + Version bump, drop old + + 01 Sep 2011; Jeroen Roovers <j...@gentoo.org> hwloc-1.2-r1.ebuild, + hwloc-1.2.1.ebuild: + Marked ~hppa (bug #381313). + +*hwloc-1.2.1 (31 Aug 2011) + + 31 Aug 2011; Alexey Shvetsov <ale...@gentoo.org> +hwloc-1.2.1.ebuild: + version bump + + 31 Aug 2011; Alexey Shvetsov <ale...@gentoo.org> hwloc-1.2-r1.ebuild: + drop hppa keyword as requested by rej + +*hwloc-1.2-r1 (31 Aug 2011) + + 31 Aug 2011; Alexey Shvetsov <ale...@gentoo.org> +hwloc-1.2-r1.ebuild: + Update deps + + 02 Aug 2011; Kacper Kowalik <xarthis...@gentoo.org> hwloc-1.2.ebuild: + Fix sandbox violation wrt bug 377375 by Vasileios Lourdas + <bugzi...@lourdas.name> + +*hwloc-1.2 (02 Aug 2011) + + 02 Aug 2011; Kacper Kowalik <xarthis...@gentoo.org> -hwloc-1.0.3.ebuild, + -hwloc-1.1.1.ebuild, +hwloc-1.2.ebuild: + Version bump, drop old + + 10 Jul 2011; Alexis Ballier <aball...@gentoo.org> hwloc-1.1.1-r1.ebuild: + keyword ~x86-fbsd, bug #372885 + +*hwloc-1.1.1-r1 (02 Jul 2011) + + 02 Jul 2011; Alexey Shvetsov <ale...@gentoo.org> +hwloc-1.1.1-r1.ebuild: + Enable prefix support for ~amd64-linux =D + +*hwloc-1.1.1 (26 Jan 2011) + + 26 Jan 2011; Justin Bronder <jsbron...@gentoo.org> +hwloc-1.1.1.ebuild: + Version bump, fix tests, push docs to correct directory + + 24 Jan 2011; Kacper Kowalik <xarthis...@gentoo.org> hwloc-1.0.3.ebuild: + Mark ~ppc64 wrt #345231 + + 18 Jan 2011; Kacper Kowalik <xarthis...@gentoo.org> -hwloc-1.0.2.ebuild: + Drop old. + +*hwloc-1.0.3 (16 Dec 2010) + + 16 Dec 2010; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.0.3.ebuild: + Version bump, add USE static-libs, migrate to autotools-utils.eclass + + 27 Nov 2010; Raúl Porcel <armi...@gentoo.org> hwloc-1.0.2.ebuild: + Add ~alpha/~ia64/~sparc wrt #345231 + + 13 Nov 2010; Jeroen Roovers <j...@gentoo.org> hwloc-1.0.2.ebuild: + Marked ~hppa ~ppc (bug #345231). + +*hwloc-1.0.2 (11 Sep 2010) + + 11 Sep 2010; Kacper Kowalik <xarthis...@gentoo.org> +hwloc-1.0.2.ebuild, + +metadata.xml: + Initial import wrt bug 299818. Ebuild written by Ruggero Morsucci + <mors_1tfl...@yahoo.it> diff --git a/sys-apps/hwloc/files/hwloc-1.8.1-gl.patch b/sys-apps/hwloc/files/hwloc-1.8.1-gl.patch new file mode 100644 index 0000000..47daa95 --- /dev/null +++ b/sys-apps/hwloc/files/hwloc-1.8.1-gl.patch @@ -0,0 +1,11 @@ +--- hwloc-1.8.1/config/hwloc.m4.orig 2014-01-30 17:46:58.000000000 +0400 ++++ hwloc-1.8.1/config/hwloc.m4 2014-02-27 13:46:28.587238873 +0400 +@@ -948,7 +948,7 @@ + hwloc_gl_happy=no]) + + AC_CHECK_HEADERS([NVCtrl/NVCtrl.h], [ +- AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext]) ++ AC_CHECK_LIB([XNVCtrl], [XNVCTRLQueryTargetAttribute], [:], [hwloc_gl_happy=no], [-lXext -lX11]) + ], [hwloc_gl_happy=no]) + + if test "x$hwloc_gl_happy" = "xyes"; then diff --git a/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild new file mode 100644 index 0000000..0d98083 --- /dev/null +++ b/sys-apps/hwloc/hwloc-1.10.0-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild,v 1.2 2015/01/05 17:56:52 aballier Exp $ + +EAPI=5 + +inherit flag-o-matic cuda autotools-multilib multilib versionator + +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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X" + +# TODO opencl only works with AMD so no virtual + +RDEPEND=">=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] + cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] ) + cuda? ( dev-util/nvidia-cuda-toolkit ) + gl? ( media-video/nvidia-settings ) + opencl? ( x11-drivers/ati-drivers ) + 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}]" + +DOCS=( AUTHORS NEWS README VERSION ) + +PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) +AUTOTOOLS_AUTORECONF=1 + +src_prepare() { + if use cuda ; then + append-cflags -I/opt/cuda/include + append-cppflags -I/opt/cuda/include + append-ldflags -L/opt/cuda/$(get_libdir) + fi + autotools-utils_src_prepare +} + +multilib_src_configure() { + export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 + local myeconfargs=( + --disable-silent-rules + --docdir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable cairo) + $(multilib_native_use_enable cuda) + $(use_enable debug) + $(multilib_native_use_enable gl) + $(multilib_native_use_enable opencl) + $(use_enable pci) + $(use_enable plugins) + $(use_enable numa libnuma) + $(use_enable xml libxml2) + $(use_with X x) + ) + autotools-utils_src_configure +} diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml new file mode 100644 index 0000000..1c247ac --- /dev/null +++ b/sys-apps/hwloc/metadata.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> +<herd>cluster</herd> +<longdescription> + The Portable Hardware Locality (hwloc) software package provides a portable abstraction + (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, + including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. + It also gathers various system attributes such as cache and memory information. + It primarily aims at helping applications with gathering information about modern computing + hardware so as to exploit it accordingly and efficiently. +</longdescription> +<use> + <flag name='cuda'>Enable CUDA device discovery</flag> + <flag name='gl'>Enable GL display device discovery (NVCtrl)</flag> + <flag name='numa'>Add support for numa memory allocation</flag> + <flag name='opencl'>Enable OpenCL device discovery (AMD only)</flag> + <flag name='pci'>Enable PCI device discovery using libpci</flag> + <flag name='plugins'>Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library)</flag> +</use> +</pkgmetadata>
