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 A3790138331 for ; Wed, 28 Sep 2016 22:51:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6697E0851; Wed, 28 Sep 2016 22:51:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 453EFE0851 for ; Wed, 28 Sep 2016 22:51:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 824463406C2 for ; Wed, 28 Sep 2016 22:51:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 799562487 for ; Wed, 28 Sep 2016 22:51:44 +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: <1475103092.968e6a0bcb47baa93568b213a8f4bf5bfd2d2183.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/colpack/files/, sci-libs/colpack/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/colpack/colpack-1.0.9-r1.ebuild sci-libs/colpack/files/colpack-1.0.8-no-bin.patch sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch X-VCS-Directories: sci-libs/colpack/files/ sci-libs/colpack/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 968e6a0bcb47baa93568b213a8f4bf5bfd2d2183 X-VCS-Branch: master Date: Wed, 28 Sep 2016 22:51:44 +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: 35804eee-79a2-44e2-948f-74187bf03add X-Archives-Hash: 2bdf058730dded66b43f50207ee5f7d9 commit: 968e6a0bcb47baa93568b213a8f4bf5bfd2d2183 Author: David Seifert gentoo org> AuthorDate: Wed Sep 28 22:47:12 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Sep 28 22:51:32 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968e6a0b sci-libs/colpack: Allow for compiling with GCC 6 Gentoo-bug: 594388 * EAPI=6 * Delete .la files when USE="-static-libs" Package-Manager: portage-2.3.1 sci-libs/colpack/colpack-1.0.9-r1.ebuild | 57 +++++++++++++++++ sci-libs/colpack/files/colpack-1.0.8-no-bin.patch | 4 +- .../colpack/files/colpack-1.0.9-fix-c++14.patch | 71 ++++++++++++++++++++++ 3 files changed, 130 insertions(+), 2 deletions(-) diff --git a/sci-libs/colpack/colpack-1.0.9-r1.ebuild b/sci-libs/colpack/colpack-1.0.9-r1.ebuild new file mode 100644 index 00000000..d2555c3 --- /dev/null +++ b/sci-libs/colpack/colpack-1.0.9-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools toolchain-funcs + +MY_PN="ColPack" + +DESCRIPTION="C++ algorithms for specialized vertex coloring problems" +LICENSE="GPL-3 LGPL-3" +HOMEPAGE="http://www.cscapes.org/coloringpage/software.htm" +SRC_URI="http://cscapes.cs.purdue.edu/download/${MY_PN}/${MY_PN}-${PV}.tar.gz" + +SLOT="0" +IUSE="openmp static-libs" +KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux" + +RDEPEND="" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.6-flags.patch" + "${FILESDIR}/${PN}-1.0.8-no-bin.patch" + "${FILESDIR}/${PN}-1.0.9-fix_gcc49_omp.patch" + "${FILESDIR}/${PN}-1.0.9-fix-c++14.patch" +) + +pkg_setup() { + if use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp; then + ewarn "You are using gcc without OpenMP" + die "Need an OpenMP capable compiler" + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + $(use_enable openmp) +} + +src_install() { + default + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +} diff --git a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch b/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch index f2400d6..e9230b0 100644 --- a/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch +++ b/sci-libs/colpack/files/colpack-1.0.8-no-bin.patch @@ -1,8 +1,8 @@ From: Sebastien Fabbro Avoid installing the ColPack binary on an absolute path ---- Makefile.am 2012-03-20 21:37:34.000000000 -0700 -+++ Makefile.am 2012-09-17 14:24:02.168309078 -0700 +--- a/Makefile.am ++++ b/Makefile.am @@ -17,8 +17,7 @@ LDADD = libColPack.la AM_DEFAULT_SOURCE_EXT = .cpp diff --git a/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch b/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch new file mode 100644 index 00000000..7076be5 --- /dev/null +++ b/sci-libs/colpack/files/colpack-1.0.9-fix-c++14.patch @@ -0,0 +1,71 @@ +From 44851d9e90d9847fbfeaaea7b0ed1e7c3d093dcb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Wed, 24 Feb 2016 23:26:20 +0100 +Subject: [PATCH] fix semantic errors in error-msgs + +--- + Utilities/extra.cpp | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/Utilities/extra.cpp b/Utilities/extra.cpp +index 21862e6..9f59263 100644 +--- a/Utilities/extra.cpp ++++ b/Utilities/extra.cpp +@@ -49,7 +49,7 @@ int WriteMatrixMarket_ADOLCInput(string s_postfix, int i_mode, ...) { + + ofstream out_Matrix (s_MatrixName.c_str()); + if(!out_Matrix) { +- cout<<"Error creating file: \""< &ListOf + } + } + } +- + } + } + } +@@ -1483,4 +1482,3 @@ int DisplayADICFormat_Value(std::list > &lvd_Value) { + } + + #endif +-