From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QOa7B-0003YD-R4 for garchives@archives.gentoo.org; Mon, 23 May 2011 18:44:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2DD01C05E; Mon, 23 May 2011 18:44:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 63E7E1C05E for ; Mon, 23 May 2011 18:44:16 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8E8F1B4024 for ; Mon, 23 May 2011 18:44:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id EEAA780505 for ; Mon, 23 May 2011 18:44:14 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <39fd3922f60015368e94cd3b36d55d4a05d45721.bicatali@gentoo> Subject: [gentoo-commits] dev/bicatali:master commit in: sci-libs/scotch/, sci-libs/scotch/files/ X-VCS-Repository: dev/bicatali X-VCS-Files: sci-libs/scotch/ChangeLog sci-libs/scotch/Manifest sci-libs/scotch/files/Makefile.inc.in sci-libs/scotch/files/metis-header.patch sci-libs/scotch/files/respect-ldflags.patch sci-libs/scotch/metadata.xml sci-libs/scotch/scotch-5.1.11-r1.ebuild X-VCS-Directories: sci-libs/scotch/ sci-libs/scotch/files/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 39fd3922f60015368e94cd3b36d55d4a05d45721 Date: Mon, 23 May 2011 18:44:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 865ed298be72fc10f7232f28a330952a commit: 39fd3922f60015368e94cd3b36d55d4a05d45721 Author: S=C3=A9bastien Fabbro gentoo org> AuthorDate: Mon May 23 18:35:36 2011 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Mon May 23 18:35:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/bicatali.git;a= =3Dcommit;h=3D39fd3922 added scotch for virtual/metis --- sci-libs/scotch/ChangeLog | 39 ++++++++ sci-libs/scotch/Manifest | 7 ++ sci-libs/scotch/files/Makefile.inc.in | 19 ++++ sci-libs/scotch/files/metis-header.patch | 11 ++ sci-libs/scotch/files/respect-ldflags.patch | 86 ++++++++++++++++ sci-libs/scotch/metadata.xml | 26 +++++ sci-libs/scotch/scotch-5.1.11-r1.ebuild | 142 +++++++++++++++++++++= ++++++ 7 files changed, 330 insertions(+), 0 deletions(-) diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog new file mode 100644 index 0000000..5b92419 --- /dev/null +++ b/sci-libs/scotch/ChangeLog @@ -0,0 +1,39 @@ +# ChangeLog for sci-libs/scotch +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.5 2011/= 05/17 10:08:20 xarthisius Exp $ + +*scotch-5.1.11-r1 (23 May 2011) + + 23 May 2011; S=C3=A9bastien Fabbro + +scotch-5.1.11-r1.ebuild, +files/Makefile.inc.in, +files/metis-header.= patch, + +files/respect-ldflags.patch, +metadata.xml: + Adapted for alternatives and virtual/metis + + 17 May 2011; Kacper Kowalik files/Makefile.inc= .in: + Fix underlinking wrt #367495. Thanks to Diego Elio Petten=C3=B2 + for the report. + + 15 Mar 2011; S=C3=A9bastien Fabbro scotch-5.1.11= .ebuild: + Added linking with zlib, librt and libm for as-needed + +*scotch-5.1.11 (05 Mar 2011) + + 05 Mar 2011; S=C3=A9bastien Fabbro -scotch-5.1.6= .ebuild, + +scotch-5.1.11.ebuild, +files/Makefile.inc.in, +files/respect-ldflags.= patch, + -files/Makefile.inc, -files/mmkt-typo.patch, metadata.xml: + Version bump. Rewrote from scratch. Closing bug #324561 and bug #33546= 8. + +*scotch-5.1.7 (15 Jan 2010) + + 15 Jan 2010; Patrick Lauer +scotch-5.1.7.ebuild, + +files/Makefile.inc_5.1.7, +files/shared-libs_5.1.7.patch: + Bump, thanks to Oliver Borm. Fixes #301012 and #297656 + +*scotch-5.1.6 (03 Sep 2009) + + 03 Sep 2009; Patrick Lauer +scotch-5.1.6.ebuild, + +files/Makefile.inc, +files/metis-header.patch, +files/mmkt-typo.patch= , + +files/shared-libs.patch, +metadata.xml: + Initial import of scotch, dependency of OpenFoam. Ebuild by Richard + Westwell and Oliver Borm. Fixes #220823 + diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest new file mode 100644 index 0000000..18fdc22 --- /dev/null +++ b/sci-libs/scotch/Manifest @@ -0,0 +1,7 @@ +AUX Makefile.inc.in 369 RMD160 3261d40521cff31e0f6a4c20799578145eb7a570 = SHA1 4e616420e499c7993f673f3df3519c3883f7c94f SHA256 d31c8abd49e662b0bb6a= f56602277e3d70c2274c9ce19110967c93539032178d +AUX metis-header.patch 381 RMD160 f364262003c72bd6f6614f0d2dae8f3be4495f= 2f SHA1 52ade3b7948c933f713602d39ddca88e6bb9eebe SHA256 271fe884e6a8eb423= f89dbbb1fc9a73f742526d76233b1f81ab9b8d0b7d27091 +AUX respect-ldflags.patch 3867 RMD160 87a069731aa5a6a15ba892d1333419c0cc= 6fbcc5 SHA1 add77e8e11604adb2461112117c858b429d0d1e3 SHA256 b277e980cc6e6= 71604dae0e5a4cba28255a786b4294f800ec20ca88d10d8aa49 +DIST scotch_5.1.11_esmumps.tgz 3952439 RMD160 f8db2bb02cbdadb7e02782dacc= ddcdc4cdec4cac SHA1 b62501e0bf7fd24af3712647578b3e764f166287 SHA256 595cc= c664ba070264b851a27b7860042a6bc716d6aade93e0909619decfabc92 +EBUILD scotch-5.1.11-r1.ebuild 3848 RMD160 b119c6c794de32b247faaff044072= fed5ba46034 SHA1 b11afe91693694eaccc39b93df9033a6388c4f39 SHA256 b8fd090a= caed19932c0ecb6c971a372f5ea477f808e0f5f4e776cb3e7715514d +MISC ChangeLog 1652 RMD160 5963ad94730256f2f101297b64cb84515c7a5eaa SHA1= a36592fd16555697ee2598b78b56a5c4baf144f6 SHA256 cfdf9f9005e6ce68df603c12= 6dbf55897ee1bf1226ff89165a2f454d15f0cbb1 +MISC metadata.xml 1007 RMD160 1ef66d65ea2ff3022b287a12a26e1b08360390ff S= HA1 5e624702b7ead9d165c0c698c77d76306439020c SHA256 fd9d3ef83d702452fa572= e5ff3217f42819579e3510dbad5fac4081b07cb5d16 diff --git a/sci-libs/scotch/files/Makefile.inc.in b/sci-libs/scotch/file= s/Makefile.inc.in new file mode 100644 index 0000000..f4d9cdf --- /dev/null +++ b/sci-libs/scotch/files/Makefile.inc.in @@ -0,0 +1,19 @@ +EXE =3D +LIB =3D .a +OBJ =3D .o + +AR =3D @AR@ +ARFLAGS =3D -ruv +CAT =3D cat +CCS =3D @CC@ +CCP =3D mpicc +CCD =3D @CC@ +CFLAGS =3D @CFLAGS@ -pthread $(PICFLAGS) -Drestrict=3D__restrict -DCOMMO= N_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_P= THREAD -DSCOTCH_RENAME +LIBS =3D -lz -lm -lrt +CP =3D cp +LEX =3D flex +LN =3D ln +MKDIR =3D mkdir +MV =3D mv +RANLIB =3D @RANLIB@ +YACC =3D bison -y diff --git a/sci-libs/scotch/files/metis-header.patch b/sci-libs/scotch/f= iles/metis-header.patch new file mode 100644 index 0000000..6768583 --- /dev/null +++ b/sci-libs/scotch/files/metis-header.patch @@ -0,0 +1,11 @@ +--- scotch-5.1.6.dfsg/src/libscotchmetis/metis.h~ 2007-09-03 11:14:42.00= 0000000 -0400 ++++ scotch-5.1.6.dfsg/src/libscotchmetis/metis.h 2008-08-26 15:09:30.000= 000000 -0400 +@@ -55,6 +55,8 @@ + /** **/ + /************************************************************/ +=20 ++typedef int idxtype; ++ + /* + ** The function prototypes. + */ diff --git a/sci-libs/scotch/files/respect-ldflags.patch b/sci-libs/scotc= h/files/respect-ldflags.patch new file mode 100644 index 0000000..7486005 --- /dev/null +++ b/sci-libs/scotch/files/respect-ldflags.patch @@ -0,0 +1,86 @@ +diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile +--- src.orig/esmumps/Makefile 2011-03-04 21:33:24.000000000 +0000 ++++ src/esmumps/Makefile 2011-03-04 23:38:01.000000000 +0000 +@@ -44,7 +44,7 @@ + $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@) +=20 + %$(EXE) : %.c +- $(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS= ) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit ++ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l= $(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@) +=20 + ## + ## Project rules. +@@ -57,9 +57,10 @@ + libesmumps$(LIB) \ + main_esmumps$(EXE) +=20 +-ptscotch : clean ++ptscotch : clean common.h ++ $(MAKE) CFLAGS=3D"$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=3D$(CCP) SCOTCHL= IB=3Dptscotch ESMUMPSLIB=3Dptesmumps \ ++ libesmumps$(LIB); + $(MAKE) CFLAGS=3D"$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=3D$(CCP) SCOTCHL= IB=3Dptscotch ESMUMPSLIB=3Dptesmumps \ +- libesmumps$(LIB) \ + main_esmumps$(EXE) +=20 + install : +diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile +--- src.orig/libscotch/Makefile 2011-03-04 21:33:24.000000000 +0000 ++++ src/libscotch/Makefile 2011-03-04 21:55:27.000000000 +0000 +@@ -43,7 +43,7 @@ + $(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@) +=20 + %$(EXE) : %.c +- $(CC) $(CFLAGS) -DSCOTCH_VERSION=3D$(VERSION) -DSCOTCH_RELEASE=3D$= (RELEASE) -DSCOTCH_PATCHLEVEL=3D$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=3D$(VERSION) -DSCOTCH_= RELEASE=3D$(RELEASE) -DSCOTCH_PATCHLEVEL=3D$(PATCHLEVEL) $(<) $(LIBS) -o = $(@) +=20 + ## + ## Project rules. +@@ -2515,7 +2515,7 @@ + mapping.h \ + order.h \ + parser.h +- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=3D$(VERSION) -DSCOTCH_RELEASE=3D= $(RELEASE) -DSCOTCH_PATCHLEVEL=3D$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS) ++ $(CCD) $(CFLAGS) $(LDLFAGS) -DSCOTCH_VERSION=3D$(VERSION) -DSCOTC= H_RELEASE=3D$(RELEASE) -DSCOTCH_PATCHLEVEL=3D$(PATCHLEVEL) $(<) -o $(@) $= (LIBS) +=20 + scotch.h : dummysizes$(EXE) \ + library.h +diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile +--- src.orig/libscotchmetis/Makefile 2011-03-04 21:33:24.000000000 +0000 ++++ src/libscotchmetis/Makefile 2011-03-04 21:56:06.000000000 +0000 +@@ -44,7 +44,7 @@ + $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<)= -o $(@) +=20 + %$(EXE) : %.c +- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(li= bdir) $(LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$= (libdir) $(LIBS) -o $(@) +=20 + ## + ## Project rules. +diff -Nur src.orig/scotch/Makefile src/scotch/Makefile +--- src.orig/scotch/Makefile 2011-03-04 21:33:24.000000000 +0000 ++++ src/scotch/Makefile 2011-03-04 21:58:59.000000000 +0000 +@@ -41,13 +41,13 @@ + include ../Makefile.inc +=20 + %$(EXE) : %$(OBJ) +- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(li= bdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$= (libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@) +=20 + %$(OBJ) : %.c + $(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@) +=20 + %$(EXE) : %.c +- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(li= bdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$= (libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@) +=20 + ## + ## Project rules. +@@ -314,7 +314,7 @@ + gout_o.c \ + $(includedir)/scotch.h \ + $(libdir)/libscotch$(LIB) +- $(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -= o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -I../libscotch -I$(includedir) gout_c.c= gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@) +=20 + gpart$(EXE) : gmap$(EXE) + -$(RM) gpart$(EXE) diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml new file mode 100644 index 0000000..62e57c7 --- /dev/null +++ b/sci-libs/scotch/metadata.xml @@ -0,0 +1,26 @@ + + + +sci + + patrick@gentoo.org + Patrick Lauer + + + oli.borm@web.de + Oliver Borm + + + SCOTCH is a software package and libraries for graph, mesh and + hypergraph partitioning, static mapping, and sparse matrix block + ordering. + Its purpose of Scotch is to apply graph theory, with a divide and + conquer approach, to scientific computing problems such as graph and + mesh partitioning, static mapping, and sparse matrix ordering, in + application domains ranging from structural mechanics to operating + systems or bio-chemistry. + The SCOTCH distribution is a set of programs and libraries which + implement the static mapping and sparse matrix reordering algorithms + developed within the SCOTCH project. + + diff --git a/sci-libs/scotch/scotch-5.1.11-r1.ebuild b/sci-libs/scotch/sc= otch-5.1.11-r1.ebuild new file mode 100644 index 0000000..210e339 --- /dev/null +++ b/sci-libs/scotch/scotch-5.1.11-r1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.11.ebuild,= v 1.2 2011/03/15 16:58:35 bicatali Exp $ + +EAPI=3D4 + +inherit eutils toolchain-funcs versionator alternatives-2 + +# use esmumps version to allow linking with mumps +MYP=3D"${PN}_${PV}_esmumps" +# download id on gforge changes every goddamn release +DID=3D28044 + +DESCRIPTION=3D"Software for graph, mesh and hypergraph partitioning" +HOMEPAGE=3D"http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/" +SRC_URI=3D"http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tgz" + +LICENSE=3D"CeCILL-2" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"doc examples mpi static-libs tools" + +DEPEND=3D"sys-devel/bison + sys-libs/zlib + mpi? ( virtual/mpi )" +RDEPEND=3D"${DEPEND}" + +S=3D"${WORKDIR}/${MYP}/src" + +make_shared_lib() { + local libstatic=3D${1} + local soname=3D$(basename "${1%.a}").so.$(get_major_version) + shift + einfo "Making ${soname}" + ${LINK:-$(tc-getCC)} ${LDFLAGS} \ + -shared -Wl,-soname=3D"${soname}" \ + -Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \ + "$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed= " +} + +src_prepare() { + epatch "${FILESDIR}"/metis-header.patch + epatch "${FILESDIR}"/respect-ldflags.patch + sed -e "s/@CFLAGS@/${CFLAGS}/" \ + -e "s/@CC@/$(tc-getCC)/" \ + -e "s/@AR@/$(tc-getAR)/" \ + -e "s/@RANLIB@/$(tc-getRANLIB)/" \ + "${FILESDIR}"/Makefile.inc.in > Makefile.inc || die +} + +src_compile() { + emake PICFLAGS=3D-fPIC + make_shared_lib libscotch/libscotcherr.a + make_shared_lib libscotch/libscotcherrexit.a + make_shared_lib libscotch/libscotch.a -L. -lscotcherr -lz -lm -lrt + make_shared_lib esmumps/libesmumps.a -Llibscotch -lscotch + make_shared_lib libscotchmetis/libscotchmetis.a -Llibscotch -lscotch + + if use mpi; then + emake PICFLAGS=3D-fPIC ptscotch + export LINK=3Dmpicc + make_shared_lib libscotch/libptscotcherr.a + make_shared_lib libscotch/libptscotcherrexit.a + make_shared_lib libscotch/libptscotch.a -Llibscotch -lptscotcherr -lz = -lm -lrt + make_shared_lib esmumps/libptesmumps.a -Llibscotch -lptscotch + make_shared_lib libscotchmetis/libptscotchparmetis.a -Llibscotch -lpts= cotch + fi + if use static-libs; then + emake clean + emake + use mpi && emake ptscotch + fi +} + +src_install() { + cd .. + local l b m + for l in $(find . -name \*.so.\*); do + dolib.so ${l} + dosym $(basename ${l}) /usr/$(get_libdir)/$(basename ${l%.*}) + done + use static-libs && dolib.a $(find . -name \*.a) + + insinto /usr/include/scotch + doins include/* + + cat <<-EOF > scotchmetis.pc + prefix=3D${EPREFIX}/usr + libdir=3D\${prefix}/$(get_libdir) + includedir=3D\${prefix}/include + Name: ptscotch + Description: ${DESCRIPTION} + Version: ${PV} + URL: ${HOMEPAGE} + Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch + Private: -lm -lz -lrt + Cflags: -I\${includedir}/scotch + EOF + insinto /usr/$(get_libdir)/pkgconfig + doins scotchmetis.pc + alternatives_for metis scotch 0 \ + "/usr/$(get_libdir)/pkgconfig/metis.pc" "scotchmetis.pc" + cat <<-EOF > ptscotchmetis.pc + prefix=3D${EPREFIX}/usr + libdir=3D\${prefix}/$(get_libdir) + includedir=3D\${prefix}/include + Name: ptscotch + Description: ${DESCRIPTION} + Version: ${PV} + URL: ${HOMEPAGE} + Libs: -L\${libdir} -lptscotchmetis -lptscotcherr -lptscotch + Private: -lm -lz -lrt + Cflags: -I\${includedir}/scotch + EOF + insinto /usr/$(get_libdir)/pkgconfig + doins ptscotchmetis.pc + alternatives_for metis-mpi scotch 0 \ + "/usr/$(get_libdir)/pkgconfig/metis-mpi.pc" "ptscotchmetis.pc" + + dodoc README.txt + + if use tools; then + pushd bin > /dev/null + for b in *; do + newbin ${b} scotch_${b} + done + popd + + pushd man/man1 > /dev/null + for m in *; do + newman ${m} scotch_${m} + done + popd > /dev/null + fi + + use doc && dodoc doc/*.pdf + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins -r examples/* tgt grf + fi +}