| 1 |
commit: 8d628d3363d9515958425df2f67bdbdf05012d87 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 30 06:27:01 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 30 06:27:01 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8d628d33 |
| 7 |
|
| 8 |
sci-chemistry/simpson: Correct blas to cblas for linking |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha108/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-chemistry/simpson/ChangeLog | 5 +- |
| 14 |
sci-chemistry/simpson/files/3.1.2-gentoo.patch | 96 ++++++++++++------------ |
| 15 |
2 files changed, 52 insertions(+), 49 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-chemistry/simpson/ChangeLog b/sci-chemistry/simpson/ChangeLog |
| 18 |
index 16c557e..9f1dcc5 100644 |
| 19 |
--- a/sci-chemistry/simpson/ChangeLog |
| 20 |
+++ b/sci-chemistry/simpson/ChangeLog |
| 21 |
@@ -1,7 +1,10 @@ |
| 22 |
# ChangeLog for sci-chemistry/simpson |
| 23 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 30 May 2012; Justin Lecher <jlec@g.o> files/3.1.2-gentoo.patch: |
| 28 |
+ Correct blas to cblas for linking |
| 29 |
+ |
| 30 |
*simpson-3.1.2 (29 Nov 2011) |
| 31 |
|
| 32 |
29 Nov 2011; Justin Lecher <jlec@g.o> +files/3.1.2-gentoo.patch, |
| 33 |
|
| 34 |
diff --git a/sci-chemistry/simpson/files/3.1.2-gentoo.patch b/sci-chemistry/simpson/files/3.1.2-gentoo.patch |
| 35 |
index 34cd2b1..a820012 100644 |
| 36 |
--- a/sci-chemistry/simpson/files/3.1.2-gentoo.patch |
| 37 |
+++ b/sci-chemistry/simpson/files/3.1.2-gentoo.patch |
| 38 |
@@ -59,56 +59,56 @@ index 216955d..ba54573 100644 |
| 39 |
-install: |
| 40 |
- $(STRIP) simpson |
| 41 |
- $(CP) simpson $(BINDIR) |
| 42 |
-+VERSION = 3.1.2 |
| 43 |
-+ |
| 44 |
-+# Mac OS X |
| 45 |
-+INCLUDES = -I/usr/include/tcl8.5 |
| 46 |
-+LIBRARIES = -lm -framework Accelerate -framework Tcl |
| 47 |
-+EXTRA_FLAGS = -DNO_CONST |
| 48 |
-+BINDIR = /usr/bin |
| 49 |
-+ |
| 50 |
-+# Windows |
| 51 |
-+#INCLUDES = -IC:/Tcl/include -I../CBLAS/src |
| 52 |
-+#LIBRARIES = -lm *.dll |
| 53 |
-+ |
| 54 |
++VERSION = 3.1.2 |
| 55 |
++ |
| 56 |
++# Mac OS X |
| 57 |
++INCLUDES = -I/usr/include/tcl8.5 |
| 58 |
++LIBRARIES = -lm -framework Accelerate -framework Tcl |
| 59 |
++EXTRA_FLAGS = -DNO_CONST |
| 60 |
++BINDIR = /usr/bin |
| 61 |
++ |
| 62 |
++# Windows |
| 63 |
++#INCLUDES = -IC:/Tcl/include -I../CBLAS/src |
| 64 |
++#LIBRARIES = -lm *.dll |
| 65 |
++ |
| 66 |
+# Linux |
| 67 |
+INCLUDES = -I@GENTOO_PORTAGE_EPREFIX@/usr/include/ |
| 68 |
-+BLASLIBS = `pkg-config --libs blas lapack` |
| 69 |
++BLASLIBS = `pkg-config --libs cblas lapack` |
| 70 |
+LIBRARIES = -lm ${BLASLIBS} -ltcl |
| 71 |
-+ |
| 72 |
-+# Linux MPI |
| 73 |
-+#INCLUDES = -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include/ |
| 74 |
-+#LIBRARIES = -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm |
| 75 |
-+#CC = mpicc |
| 76 |
-+#EXTRA_FLAGS = -DMKL_INTEL -DMPI |
| 77 |
-+ |
| 78 |
-+SRC = B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \ |
| 79 |
-+OCroutines.c csa.c gdfontg.c isotopes.c restrict.c tclcode.c \ |
| 80 |
-+cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \ |
| 81 |
-+cmblock.c fft.c gdfontmb.c matrix_new.c rfshapes.c wigner.c \ |
| 82 |
-+complx.c fidcalc.c gdfonts.c new_direct.c sim.c zte.c \ |
| 83 |
-+contour.c fit.c gdfontt.c pulse.c simplex.c \ |
| 84 |
-+cryst.c ftools.c ham.c readsys.c simpson.c |
| 85 |
-+OBJ = $(SRC:.c=.o) |
| 86 |
-+CC = gcc |
| 87 |
-+STRIP = strip |
| 88 |
-+CP = cp |
| 89 |
-+FLAGS = -c -O3 |
| 90 |
-+RM = rm |
| 91 |
-+TAR = tar |
| 92 |
-+MKDIR = mkdir |
| 93 |
-+ |
| 94 |
-+simpson: $(OBJ) |
| 95 |
++ |
| 96 |
++# Linux MPI |
| 97 |
++#INCLUDES = -I/usr/include/tcl8.4 -I/com/intel/mkl/10.1.1.019/include/ |
| 98 |
++#LIBRARIES = -L/com/intel/mkl/10.1.1.019/lib/em64t -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -lmkl_lapack -liomp5 -ltcl8.4 -lm |
| 99 |
++#CC = mpicc |
| 100 |
++#EXTRA_FLAGS = -DMKL_INTEL -DMPI |
| 101 |
++ |
| 102 |
++SRC = B0inhom.c crystdat.c gd.c iodata.c relax.c spinsys.c \ |
| 103 |
++OCroutines.c csa.c gdfontg.c isotopes.c restrict.c tclcode.c \ |
| 104 |
++cm_new.c csastat.c gdfontl.c main.c rfprof.c tclutil.c \ |
| 105 |
++cmblock.c fft.c gdfontmb.c matrix_new.c rfshapes.c wigner.c \ |
| 106 |
++complx.c fidcalc.c gdfonts.c new_direct.c sim.c zte.c \ |
| 107 |
++contour.c fit.c gdfontt.c pulse.c simplex.c \ |
| 108 |
++cryst.c ftools.c ham.c readsys.c simpson.c |
| 109 |
++OBJ = $(SRC:.c=.o) |
| 110 |
++CC = gcc |
| 111 |
++STRIP = strip |
| 112 |
++CP = cp |
| 113 |
++FLAGS = -c -O3 |
| 114 |
++RM = rm |
| 115 |
++TAR = tar |
| 116 |
++MKDIR = mkdir |
| 117 |
++ |
| 118 |
++simpson: $(OBJ) |
| 119 |
+ $(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBRARIES) |
| 120 |
-+.c.o: |
| 121 |
++.c.o: |
| 122 |
+ $(CC) $(CFLAGS) $(EXTRA_FLAGS) $(INCLUDES) -DVERSION=\"$(VERSION)\" -c $< |
| 123 |
-+clean: |
| 124 |
-+ $(RM) -f *.o simpson |
| 125 |
-+dist: |
| 126 |
-+ $(MKDIR) simpson-source-$(VERSION) |
| 127 |
-+ $(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION) |
| 128 |
-+ $(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION) |
| 129 |
-+ $(RM) -fr simpson-source-$(VERSION) |
| 130 |
-+install: |
| 131 |
-+ $(STRIP) simpson |
| 132 |
-+ $(CP) simpson $(BINDIR) |
| 133 |
++clean: |
| 134 |
++ $(RM) -f *.o simpson |
| 135 |
++dist: |
| 136 |
++ $(MKDIR) simpson-source-$(VERSION) |
| 137 |
++ $(CP) -r *.c *.h simpson.xcodeproj Makefile simpson-source-$(VERSION) |
| 138 |
++ $(TAR) cvjf simpson-source-$(VERSION).tbz2 simpson-source-$(VERSION) |
| 139 |
++ $(RM) -fr simpson-source-$(VERSION) |
| 140 |
++install: |
| 141 |
++ $(STRIP) simpson |
| 142 |
++ $(CP) simpson $(BINDIR) |
Archives