diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-10-31 13:30:08 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-10-31 13:30:08 +0000 |
commit | 6d4ff31f39a8d7bdc67c672569504b7a59f7da21 (patch) | |
tree | ce2a5766964051364982cab45f26d3512b01cb38 /sci-libs/punc | |
parent | Stable on amd64 wrt bug #343313 (diff) | |
download | gentoo-2-6d4ff31f39a8d7bdc67c672569504b7a59f7da21.tar.gz gentoo-2-6d4ff31f39a8d7bdc67c672569504b7a59f7da21.tar.bz2 gentoo-2-6d4ff31f39a8d7bdc67c672569504b7a59f7da21.zip |
Version Bump
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/punc')
-rw-r--r-- | sci-libs/punc/ChangeLog | 8 | ||||
-rw-r--r-- | sci-libs/punc/files/1.4-linking.patch | 153 | ||||
-rw-r--r-- | sci-libs/punc/punc-1.4.ebuild | 66 |
3 files changed, 226 insertions, 1 deletions
diff --git a/sci-libs/punc/ChangeLog b/sci-libs/punc/ChangeLog index fcfe17a0f869..8571532b5cca 100644 --- a/sci-libs/punc/ChangeLog +++ b/sci-libs/punc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-libs/punc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.3 2010/07/28 15:16:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.4 2010/10/31 13:30:08 jlec Exp $ + +*punc-1.4 (31 Oct 2010) + + 31 Oct 2010; Justin Lecher <jlec@gentoo.org> +files/1.4-linking.patch, + +punc-1.4.ebuild: + Version Bump 28 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> punc-0.2_p1.ebuild, +files/punc-0.2_p1-libdir.patch: diff --git a/sci-libs/punc/files/1.4-linking.patch b/sci-libs/punc/files/1.4-linking.patch new file mode 100644 index 000000000000..e6cab2caca13 --- /dev/null +++ b/sci-libs/punc/files/1.4-linking.patch @@ -0,0 +1,153 @@ +diff --git a/configure.ac b/configure.ac +index fcff075..f1262da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -48,7 +48,8 @@ dnl 2. checks for programs + AC_LANG_C + AC_PROG_CC + AC_PROG_CPP +-AC_DISABLE_SHARED ++AC_PROG_F77 ++AC_F77_LIBRARY_LDFLAGS + AM_PROG_LIBTOOL + + dnl 3. checks for libraries +@@ -358,7 +359,7 @@ else + AC_CHECK_LIB(blas,dscal_, + [blas_use="yes";blas_lib="${blas_lib_path}-lblas"], + [blas_use="";blas_lib=""], +- [${blas_lib_path}-lblas -lvf2c]) ++ [${blas_lib_path}-lblas]) + if test -z "${blas_use}"; then + AC_MSG_RESULT([** BLAS library missing ...will BUILD **]) + blas="blas"; +@@ -413,7 +414,7 @@ else + AC_CHECK_LIB(lapack,dsysv_, + [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"], + [lapack_use="";lapack_lib=""], +- [${lapack_lib_path}-llapack ${blas_lib} -lvf2c]) ++ [${lapack_lib_path}-llapack ${blas_lib}]) + if test -z "${lapack_use}"; then + AC_MSG_RESULT([** LAPACK library missing ...will BUILD **]) + lapack="lapack"; +@@ -465,10 +466,10 @@ else + LDFLAGS_SAVE=${LDFLAGS}; + LDFLAGS=${amd_lib_path}; + amd_use=""; +- AC_CHECK_LIB(amd,AMD_order, ++ AC_CHECK_LIB(amd,amd_order, + [amd_use="yes";amd_lib="${amd_lib_path}-lamd"], + [amd_use="";amd_lib=""], +- [${amd_lib_path}-lamd ${blas_lib} -lvf2c]) ++ [${amd_lib_path}-lamd ${blas_lib}]) + if test -z "${amd_use}"; then + AC_MSG_RESULT([** AMD library missing ...will BUILD **]) + amd="amd"; +@@ -520,10 +521,10 @@ else + LDFLAGS_SAVE=${LDFLAGS}; + LDFLAGS=${umfpack_lib_path}; + umfpack_use=""; +- AC_CHECK_LIB(umfpack,UMFPACK_numeric, ++ AC_CHECK_LIB(umfpack,umfpack_di_numeric, + [umfpack_use="yes";umfpack_lib="${umfpack_lib_path}-lumfpack"], + [umfpack_use="";umfpack_lib=""], +- [${umfpack_lib_path}-lumfpack ${blas_lib} -lvf2c]) ++ [${umfpack_lib_path}-lumfpack ${blas_lib}]) + if test -z "${umfpack_use}"; then + AC_MSG_RESULT([** UMFPACK library missing ...will BUILD **]) + umfpack="umfpack"; +@@ -578,7 +579,7 @@ else + AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store, + [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"], + [superlu_use="";superlu_lib=""], +- [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib} -lvf2c]) ++ [${superlu_lib_path}-lsuperlu ${lapack_lib} ${blas_lib}]) + if test -z "${superlu_use}"; then + AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **]) + superlu="superlu"; +@@ -633,7 +634,7 @@ else + AC_CHECK_LIB(arpack,dsgets_, + [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"], + [arpack_use="";arpack_lib=""], +- [${arpack_lib_path}-larpack ${blas_lib} -lvf2c]) ++ [${arpack_lib_path}-larpack ${blas_lib}]) + if test -z "${arpack_use}"; then + AC_MSG_RESULT([** ARPACK library missing ...will BUILD **]) + arpack="arpack"; +@@ -688,7 +689,7 @@ else + AC_CHECK_LIB(cgcode,scgdrv_, + [cgcode_use="yes";cgcode_lib="${cgcode_lib_path}-lcgcode"], + [cgcode_use="";cgcode_lib=""], +- [${cgcode_lib_path}-lcgcode ${blas_lib} -lvf2c]) ++ [${cgcode_lib_path}-lcgcode ${blas_lib}]) + if test -z "${cgcode_use}"; then + AC_MSG_RESULT([** CGCODE library missing ...will BUILD **]) + cgcode="cgcode"; +@@ -743,7 +744,7 @@ else + AC_CHECK_LIB(pmg,buildg_, + [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"], + [pmg_use="";pmg_lib=""], +- [${pmg_lib_path}-lpmg ${blas_lib} -lvf2c]) ++ [${pmg_lib_path}-lpmg ${blas_lib}]) + if test -z "${pmg_use}"; then + AC_MSG_RESULT([** PMG library missing ...will BUILD **]) + pmg="pmg"; +@@ -982,13 +983,6 @@ AC_OUTPUT([ + src/base/Makefile + + src/vf2c/Makefile +- src/blas/Makefile +- src/lapack/Makefile +- src/amd/Makefile +- src/umfpack/Makefile +- src/superlu/Makefile +- src/arpack/Makefile +- src/cgcode/Makefile + src/pmg/Makefile + + src/aaa_inc/Makefile +diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am +index 2e17d41..2e1ce1e 100644 +--- a/src/aaa_lib/Makefile.am ++++ b/src/aaa_lib/Makefile.am +@@ -102,11 +102,10 @@ else + LIBPMG = + endif + +-libdir = ${prefix}/lib + lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBAMD} ${LIBUMFPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG} + + libpunc_la_SOURCES = +-libpunc_la_LIBADD = ${BASE_LIBS} ++libpunc_la_LIBADD = ${BASE_LIBS} -lm + libpunc_la_LDFLAGS = -version-info ${FETK_VERSION} + + libvf2c_la_SOURCES = +@@ -142,6 +141,6 @@ libcgcode_la_LIBADD = ${CGCODE_LIBS} + libcgcode_la_LDFLAGS = -version-info ${FETK_VERSION} + + libpmg_la_SOURCES = +-libpmg_la_LIBADD = ${PMG_LIBS} ++libpmg_la_LIBADD = ${PMG_LIBS} -lgfortran -lf2c -lmaloc -lm + libpmg_la_LDFLAGS = -version-info ${FETK_VERSION} + +diff --git a/src/pmg/Makefile.am b/src/pmg/Makefile.am +index cae9324..8eb0ba0 100644 +--- a/src/pmg/Makefile.am ++++ b/src/pmg/Makefile.am +@@ -38,13 +38,14 @@ always_built_SUBDIRS = + SUBDIRS = $(always_built_SUBDIRS) . + THISLIB = pmg + +-noinst_LTLIBRARIES = libpmg.la ++lib_LTLIBRARIES = libpmg.la + + SRC = buildAd.c buildBd.c buildGd.c buildPd.c cgd.c cgmgd.c cgmgdrvd.c gsd.c matvecd.c mblasd.c mgcsd.c mgdrvd.c mgfasd.c mgsubd.c mikpckd.c mlinpckd.c ncgd.c ncgdrvd.c newdrvd.c newtond.c ngsd.c ngsdrvd.c ninterpd.c nrchd.c nrchdrvd.c nsmoothd.c nsord.c nsordrvd.c nwjd.c nwjdrvd.c powerd.c rchd.c smoothd.c sord.c wjd.c + + libpmg_la_SOURCES = ${SRC} + INCLUDES = @maloc_inc@ + AM_CFLAGS = @profile@ @pedantic_ansi@ ++libpmg_la_LIBADD = -lf2c + + all-local: + # -cp -p ${top_srcdir}/src/${THISLIB}/punc/*.h ../aaa_inc/punc/. diff --git a/sci-libs/punc/punc-1.4.ebuild b/sci-libs/punc/punc-1.4.ebuild new file mode 100644 index 000000000000..6fd674aadda6 --- /dev/null +++ b/sci-libs/punc/punc-1.4.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.4.ebuild,v 1.1 2010/10/31 13:30:08 jlec Exp $ + +EAPI="3" + +inherit autotools multilib + +DESCRIPTION="Portable Understructure for Numerical Computing" +HOMEPAGE="http://fetk.org/codes/punc/index.html" +SRC_URI="http://www.fetk.org/codes/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug mpi static-libs" + +DEPEND=" + dev-libs/maloc[mpi=] + dev-libs/libf2c + sci-libs/amd + sci-libs/cgcode + sci-libs/arpack[mpi=] + sci-libs/superlu + sci-libs/umfpack + virtual/blas + mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}" + +src_prepare() { + rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack} + epatch \ + "${FILESDIR}"/${PV}-linking.patch + + cp tools/tests/pmg/*.f src/pmg/ -f + cp tools/tests/pmg/*.c src/pmg/ -f + cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h + + eautoreconf +} + +src_configure() { + export FETK_INCLUDE="${EPREFIX}/usr/include" + export FETK_LIBRARY="${EPREFIX}/usr/$(get_libdir)" + export FETK_LAPACK_LIBRARY="$(pkg-config --libs lapack)" + export FETK_BLAS_LIBRARY="${FETK_LIBRARY}" + export FETK_SUPERLU_LIBRARY="-lsuperlu" + export FETK_ARPACK_LIBRARY="${EPREFIX}/usr/$(get_libdir)" + export FETK_UMFPACK_LIBRARY="${EPREFIX}/usr/$(get_libdir)" + export FETK_CGCODE_LIBRARY="${EPREFIX}/usr/$(get_libdir)" + export FETK_AMD_LIBRARY="${EPREFIX}/usr/$(get_libdir)" + + econf \ + $(use_enable static-libs static) \ + $(use_enable debug vdebug) \ + --enable-shared \ + --disable-triplet +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + dohtml doc/index.html || die "failed to install html docs" +} |