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 23434139694 for ; Sat, 13 May 2017 19:15:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7541AE0BF1; Sat, 13 May 2017 19:15:23 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 53104E0BF1 for ; Sat, 13 May 2017 19:15:22 +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 E829133E1CB for ; Sat, 13 May 2017 19:15:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7741303 for ; Sat, 13 May 2017 19:15:19 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1494702909.b94633df167641dea74c92ebca18e6b7215e7a50.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/hwloc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/hwloc/hwloc-1.11.7.ebuild X-VCS-Directories: sys-apps/hwloc/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: b94633df167641dea74c92ebca18e6b7215e7a50 X-VCS-Branch: master Date: Sat, 13 May 2017 19:15:19 +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-Archives-Salt: 14af15c5-8b7b-44a1-94f2-9de4aa7cdfd8 X-Archives-Hash: f12ff267dafbf3a37855d313c696bdfe commit: b94633df167641dea74c92ebca18e6b7215e7a50 Author: David Seifert gentoo org> AuthorDate: Sat May 13 19:14:39 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sat May 13 19:15:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b94633df sys-apps/hwloc: Port to EAPI 6 Package-Manager: Portage-2.3.5, Repoman-2.3.2 sys-apps/hwloc/hwloc-1.11.7.ebuild | 48 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/sys-apps/hwloc/hwloc-1.11.7.ebuild b/sys-apps/hwloc/hwloc-1.11.7.ebuild index fbff0ec3ca1..0630d0411f9 100644 --- a/sys-apps/hwloc/hwloc-1.11.7.ebuild +++ b/sys-apps/hwloc/hwloc-1.11.7.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit flag-o-matic cuda autotools-multilib multilib versionator +inherit autotools cuda flag-o-matic versionator multilib-minimal MY_PV=v$(get_version_component_range 1-2) @@ -35,36 +35,36 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}] DEPEND="${RDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" +PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" ) DOCS=( AUTHORS NEWS README VERSION ) -PATCHES=( - "${FILESDIR}/${PN}-1.8.1-gl.patch" -) -AUTOTOOLS_AUTORECONF=1 - src_prepare() { + default + eautoreconf + if use cuda ; then - append-cflags -I/opt/cuda/include - append-cppflags -I/opt/cuda/include + append-cflags -I"${EPREFIX}"/opt/cuda/include + append-cppflags -I"${EPREFIX}"/opt/cuda/include fi - autotools-utils_src_prepare } multilib_src_configure() { export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467 - use cuda && local LDFLAGS="${LDFLAGS} -L/opt/cuda/$(get_libdir)" - local myeconfargs=( - --disable-silent-rules - --docdir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable cairo) - $(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) + + 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) \ + $(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) - ) - autotools-utils_src_configure }