* [gentoo-commits] proj/sci:master commit in: sci-libs/scotch/, sci-libs/scotch/files/
@ 2012-08-03 15:26 Sebastien Fabbro
0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro @ 2012-08-03 15:26 UTC (permalink / raw
To: gentoo-commits
commit: 55a251638095b7f5deeeb0042928a3237fc8274c
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Fri Aug 3 15:26:19 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug 3 15:26:19 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=55a25163
scotch in main tree
---
sci-libs/scotch/ChangeLog | 63 --------
.../scotch/files/scotch-5.1.12b-as-needed.patch | 112 --------------
sci-libs/scotch/metadata.xml | 23 ---
sci-libs/scotch/scotch-5.1.12b.ebuild | 156 --------------------
4 files changed, 0 insertions(+), 354 deletions(-)
diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog
deleted file mode 100644
index 57c2a3a..0000000
--- a/sci-libs/scotch/ChangeLog
+++ /dev/null
@@ -1,63 +0,0 @@
-# ChangeLog for sci-libs/scotch
-# Copyright 1999-2012 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 $
-
- 12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
- scotch-5.1.12b.ebuild:
- sci-libs/scotch: Shared library fixes and prefix love
-
- 28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild:
- keyword amd64-linux and x86-linux
-
- 28 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild:
- add pthread for as-needed
-
- 12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.12b.ebuild,
- metadata.xml:
- added 64bits integer flag and described the tools flag
-
-*scotch-5.1.12b (12 Mar 2012)
-
- 12 Mar 2012; Sébastien Fabbro <bicatali@gentoo.org> +scotch-5.1.12b.ebuild,
- +files/scotch-5.1.12b-as-needed.patch, +metadata.xml:
- Version bump. Dropped metis compatibility, it needs some work (probably
- upstream). Added parallel build and as-needed fix
-
- 01 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.11-r1.ebuild,
- files/metis-header.patch:
- Fixed shared libs and cleaning.
-
-*scotch-5.1.11-r1 (23 May 2011)
-
- 23 May 2011; Sébastien Fabbro <bicatali@gentoo.org>
- +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 <xarthisius@gentoo.org> files/Makefile.inc.in:
- Fix underlinking wrt #367495. Thanks to Diego Elio Pettenò
- <flameeyes@gentoo.org> for the report.
-
- 15 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> 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ébastien Fabbro <bicatali@gentoo.org> -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 #335468.
-
-*scotch-5.1.7 (15 Jan 2010)
-
- 15 Jan 2010; Patrick Lauer <pal@gentoo.org> +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 <patrick@gentoo.org> +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/files/scotch-5.1.12b-as-needed.patch b/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
deleted file mode 100644
index 73888d8..0000000
--- a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
---- src.orig/esmumps/Makefile 2012-03-12 00:14:14.536109811 +0000
-+++ src/esmumps/Makefile 2012-03-12 04:26:12.884108074 +0000
-@@ -44,7 +44,7 @@
- $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit
-+ $(CC) $(CFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
-
- ##
- ## Project rules.
-@@ -57,9 +57,9 @@
- libesmumps$(LIB) \
- main_esmumps$(EXE)
-
--ptscotch : clean
-+ptscotch : clean common.h
- $(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps \
-- libesmumps$(LIB) \
-+ libptesmumps$(LIB) \
- main_esmumps$(EXE)
-
- install :
-@@ -142,7 +142,7 @@
- common.h \
- esmumps.h
-
--libesmumps$(LIB) : graph_graph$(OBJ) \
-+lib$(ESMUMPSLIB)$(LIB) : graph_graph$(OBJ) \
- order$(OBJ) \
- order_scotch_graph$(OBJ) \
- dof$(OBJ) \
-diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
---- src.orig/libscotch/Makefile 2012-03-12 00:14:14.496108751 +0000
-+++ src/libscotch/Makefile 2012-03-12 01:32:28.562403624 +0000
-@@ -43,7 +43,7 @@
- $(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+ $(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LDFLAGS) -o $(@)
-
- ##
- ## Project rules.
-@@ -2543,7 +2543,7 @@
- mapping.h \
- order.h \
- parser.h
-- $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+ $(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LDFLAGS) -o $(@)
-
- scotch.h : dummysizes$(EXE) \
- library.h
-diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
---- src.orig/libscotchmetis/Makefile 2012-03-12 00:14:14.456107691 +0000
-+++ src/libscotchmetis/Makefile 2012-03-12 01:35:00.166422784 +0000
-@@ -44,7 +44,7 @@
- $(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
-+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) $(LDFLAGS) -o $(@)
-
- ##
- ## Project rules.
-diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
---- src.orig/scotch/Makefile 2012-03-12 00:14:14.536109811 +0000
-+++ src/scotch/Makefile 2012-03-12 00:50:22.033571205 +0000
-@@ -41,13 +41,13 @@
- include ../Makefile.inc
-
- %$(EXE) : %$(OBJ)
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
-
- %$(OBJ) : %.c
- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
-
- %$(EXE) : %.c
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
-
- ##
- ## Project rules.
-@@ -205,7 +205,7 @@
- $(libdir)/libptscotch$(LIB) \
- $(libdir)/libptscotcherrexit$(LIB) \
- dgmap.h
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
-
- dgscat$(EXE) : dgscat.c \
- ../libscotch/module.h \
-@@ -315,7 +315,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) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) -o $(@)
-
- gpart$(EXE) : gmap.c \
- ../libscotch/module.h \
-@@ -324,7 +324,7 @@
- $(libdir)/libscotch$(LIB) \
- $(libdir)/libscotcherrexit$(LIB) \
- gmap.h
-- $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+ $(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
-
-
- gscat$(EXE) : gscat.c \
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
deleted file mode 100644
index 16d2bae..0000000
--- a/sci-libs/scotch/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
- 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.
-</longdescription>
-<use>
- <flag name='int64'>Build the 64 bits integer library (needed for > 2^31 vertices)</flag>
- <flag name='tools'>Build and install extra exec tools</flag>
-</use>
-
-</pkgmetadata>
diff --git a/sci-libs/scotch/scotch-5.1.12b.ebuild b/sci-libs/scotch/scotch-5.1.12b.ebuild
deleted file mode 100644
index 994c1f6..0000000
--- a/sci-libs/scotch/scotch-5.1.12b.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib
-
-# use esmumps version to allow linking with mumps
-MYP="${PN}_${PV}_esmumps"
-# download id on gforge changes every goddamn release
-DID=28978
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples int64 mpi static-libs tools"
-
-DEPEND="sys-libs/zlib
- mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MYP/b}"
-
-static_to_shared() {
- local libstatic=${1}; shift
- local libname=$(basename ${libstatic%.a})
- local soname=${libname}$(get_libname $(get_version_component_range 1-2))
- local libdir=$(dirname ${libstatic})
-
- einfo "Making ${soname} from ${libstatic}"
- if [[ ${CHOST} == *-darwin* ]] ; then
- ${LINK:-$(tc-getCC)} ${LDFLAGS} \
- -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
- -Wl,-all_load -Wl,${libstatic} \
- "$@" -o ${libdir}/${soname} || die "${soname} failed"
- else
- ${LINK:-$(tc-getCC)} ${LDFLAGS} \
- -shared -Wl,-soname=${soname} \
- -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
- "$@" -o ${libdir}/${soname} || die "${soname} failed"
- [[ $(get_version_component_count) -gt 1 ]] && \
- ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
- ln -s ${soname} ${libdir}/${libname}$(get_libname)
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-as-needed.patch
- sed -e "s/-O3/${CFLAGS} -pthread/" \
- -e "s/gcc/$(tc-getCC)/" \
- -e "s/ ar/ $(tc-getAR)/" \
- -e "s/ranlib/$(tc-getRANLIB)/" \
- src/Make.inc/Makefile.inc.i686_pc_linux2 > src/Makefile.inc || die
- use int64 && append-cflags -DIDXSIZE64
-}
-
-src_compile() {
- emake -C src CLIBFLAGS=-fPIC
- static_to_shared lib/libscotcherr.a
- static_to_shared lib/libscotcherrexit.a
- static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lscotcherr
- static_to_shared lib/libesmumps.a -Llib -lscotch
- static_to_shared lib/libscotchmetis.a -Llib -lscotch
-
- if use mpi; then
- emake -C src CLIBFLAGS=-fPIC ptscotch
- export LINK=mpicc
- static_to_shared lib/libptscotcherr.a
- static_to_shared lib/libptscotcherrexit.a
- static_to_shared lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt
- static_to_shared lib/libptesmumps.a -Llib -lptscotch
- static_to_shared lib/libptscotchparmetis.a -Llib -lptscotch
- fi
- if use static-libs; then
- emake -C src clean
- emake -C src
- use mpi && emake -C src ptscotch
- fi
-}
-
-src_install() {
- dolib.so lib/lib*$(get_libname)*
- use static-libs && dolib.a lib/*.a
-
- insinto /usr/include/scotch
- doins include/*
-
- cat <<-EOF > scotchmetis.pc
- prefix=${EPREFIX}/usr
- libdir=\${prefix}/$(get_libdir)
- includedir=\${prefix}/include
- Name: scotchmetis
- 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
-
- # not sure it is actually a full replacement of metis
- #alternatives_for metis scotch 0 \
- # /usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
-
- if use mpi; then
- cat <<-EOF > ptscotchparmetis.pc
- prefix=${EPREFIX}/usr
- libdir=\${prefix}/$(get_libdir)
- includedir=\${prefix}/include
- Name: ptscotchparmetis
- Description: ${DESCRIPTION}
- Version: ${PV}
- URL: ${HOMEPAGE}
- Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
- Private: -lm -lz -lrt
- Cflags: -I\${includedir}/scotch
- Requires: scotchmetis
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ptscotchparmetis.pc
- # not sure it is actually a full replacement of parmetis
- #alternatives_for metis-mpi ptscotch 0 \
- # /usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
- fi
-
- dodoc README.txt
-
- if use tools; then
- local b m
- pushd bin > /dev/null
- for b in *; do
- newbin ${b} scotch_${b}
- done
- popd > /dev/null
-
- 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
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-03 15:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-03 15:26 [gentoo-commits] proj/sci:master commit in: sci-libs/scotch/, sci-libs/scotch/files/ Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox