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 1SaPK5-0006cy-7W for garchives@archives.gentoo.org; Fri, 01 Jun 2012 10:43:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EA24E061F; Fri, 1 Jun 2012 10:42:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 08E13E061F for ; Fri, 1 Jun 2012 10:42:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4BF2A1B400D for ; Fri, 1 Jun 2012 10:42:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 14BD3E5428 for ; Fri, 1 Jun 2012 10:42:54 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1338359221.8d628d3363d9515958425df2f67bdbdf05012d87.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/simpson/files/, sci-chemistry/simpson/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/simpson/ChangeLog sci-chemistry/simpson/files/3.1.2-gentoo.patch X-VCS-Directories: sci-chemistry/simpson/files/ sci-chemistry/simpson/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8d628d3363d9515958425df2f67bdbdf05012d87 X-VCS-Branch: master Date: Fri, 1 Jun 2012 10:42:54 +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: e028c0ca-9910-493a-9c0c-89dadc22b07a X-Archives-Hash: 7876532fb24dfc94a8a2231cb91d91d2 commit: 8d628d3363d9515958425df2f67bdbdf05012d87 Author: Justin Lecher gentoo org> AuthorDate: Wed May 30 06:27:01 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Wed May 30 06:27:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D8d628d33 sci-chemistry/simpson: Correct blas to cblas for linking (Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest comm= it) --- sci-chemistry/simpson/ChangeLog | 5 +- sci-chemistry/simpson/files/3.1.2-gentoo.patch | 96 ++++++++++++------= ------ 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/Chan= geLog index 16c557e..9f1dcc5 100644 --- a/sci-chemistry/simpson/ChangeLog +++ b/sci-chemistry/simpson/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-chemistry/simpson -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 30 May 2012; Justin Lecher files/3.1.2-gentoo.patch: + Correct blas to cblas for linking + *simpson-3.1.2 (29 Nov 2011) =20 29 Nov 2011; Justin Lecher +files/3.1.2-gentoo.patch= , diff --git a/sci-chemistry/simpson/files/3.1.2-gentoo.patch b/sci-chemist= ry/simpson/files/3.1.2-gentoo.patch index 34cd2b1..a820012 100644 --- a/sci-chemistry/simpson/files/3.1.2-gentoo.patch +++ b/sci-chemistry/simpson/files/3.1.2-gentoo.patch @@ -59,56 +59,56 @@ index 216955d..ba54573 100644 -install: - $(STRIP) simpson - $(CP) simpson $(BINDIR) -+VERSION =3D 3.1.2 -+ -+# Mac OS X -+INCLUDES =3D -I/usr/include/tcl8.5 -+LIBRARIES =3D -lm -framework Accelerate -framework Tcl -+EXTRA_FLAGS =3D -DNO_CONST -+BINDIR =3D /usr/bin -+ -+# Windows -+#INCLUDES =3D -IC:/Tcl/include -I../CBLAS/src -+#LIBRARIES =3D -lm *.dll -+ ++VERSION =3D 3.1.2 ++ ++# Mac OS X ++INCLUDES =3D -I/usr/include/tcl8.5 ++LIBRARIES =3D -lm -framework Accelerate -framework Tcl ++EXTRA_FLAGS =3D -DNO_CONST ++BINDIR =3D /usr/bin ++ ++# Windows ++#INCLUDES =3D -IC:/Tcl/include -I../CBLAS/src ++#LIBRARIES =3D -lm *.dll ++ +# Linux +INCLUDES =3D -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ -+BLASLIBS =3D `pkg-config --libs blas lapack` ++BLASLIBS =3D `pkg-config --libs cblas lapack` +LIBRARIES =3D -lm ${BLASLIBS} -ltcl -+ -+# Linux MPI=20 -+#INCLUDES =3D -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include= /=20 -+#LIBRARIES =3D -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -= lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm -+#CC =3D mpicc -+#EXTRA_FLAGS =3D -DMKL_INTEL -DMPI -+ -+SRC =3D B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \ -+OCroutines.c csa.c gdfontg.c isotopes.c restrict.c tclcode.c \ -+cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \ -+cmblock.c fft.c gdfontmb.c matrix_new.c rfshapes.c wigner.c \ -+complx.c fidcalc.c gdfonts.c new_direct.c sim.c zte.c \ -+contour.c fit.c gdfontt.c pulse.c simplex.c \ -+cryst.c ftools.c ham.c readsys.c simpson.c -+OBJ =3D $(SRC:.c=3D.o) -+CC =3D gcc -+STRIP =3D strip -+CP =3D cp -+FLAGS =3D -c -O3 -+RM =3D rm -+TAR =3D tar -+MKDIR =3D mkdir -+ -+simpson: $(OBJ) ++ ++# Linux MPI=20 ++#INCLUDES =3D -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include= /=20 ++#LIBRARIES =3D -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -= lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm ++#CC =3D mpicc ++#EXTRA_FLAGS =3D -DMKL_INTEL -DMPI ++ ++SRC =3D B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \ ++OCroutines.c csa.c gdfontg.c isotopes.c restrict.c tclcode.c \ ++cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \ ++cmblock.c fft.c gdfontmb.c matrix_new.c rfshapes.c wigner.c \ ++complx.c fidcalc.c gdfonts.c new_direct.c sim.c zte.c \ ++contour.c fit.c gdfontt.c pulse.c simplex.c \ ++cryst.c ftools.c ham.c readsys.c simpson.c ++OBJ =3D $(SRC:.c=3D.o) ++CC =3D gcc ++STRIP =3D strip ++CP =3D cp ++FLAGS =3D -c -O3 ++RM =3D rm ++TAR =3D tar ++MKDIR =3D mkdir ++ ++simpson: $(OBJ) + $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBRARIES) -+.c.o: ++.c.o: + $(CC) $(CFLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=3D\"$(VERSION)\" = -c $< -+clean: -+ $(RM) -f *.o simpson -+dist: -+ $(MKDIR) simpson-source-$(VERSION) -+ $(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION) -+ $(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION) -+ $(RM) -fr simpson-source-$(VERSION) -+install: -+ $(STRIP) simpson -+ $(CP) simpson $(BINDIR) ++clean: ++ $(RM) -f *.o simpson ++dist: ++ $(MKDIR) simpson-source-$(VERSION) ++ $(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION) ++ $(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION) ++ $(RM) -fr simpson-source-$(VERSION) ++install: ++ $(STRIP) simpson ++ $(CP) simpson $(BINDIR)