1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
Author: Andreas Tille <tille@debian.org>
Author: Sbastien Villemot <sebastien@debian.org>
Last-Update: 2017-09-10
Description: Use Debian package for BLAS/LAPACK (instead of obsolete clapack)
- Use -lblas instead of -lblaswr
- Use -ltmglib instead of -ltmg
- Do not use f2c, not needed
- Introduce prototypes for LAPACK functions used in the package
(those are documented in the manpages from the liblapack-doc package)
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -12,29 +12,9 @@ endif
ifdef CLAPACKPATH # only do below if using CLAPACK
-all: liblinks phastlib
-
-sharedlib: liblinks sharedphastlib
-
-# by default, CLAPACK uses non-standard library names, which confuses
-# the compiler. We'll just create symbolic links in ${PHAST}/lib that
-# have proper names
-liblinks: ${PHAST}/lib/liblapack.a ${PHAST}/lib/libtmg.a \
- ${PHAST}/lib/libblaswr.a
-
-${PHAST}/lib/liblapack.a: ${CLAPACKPATH}/lapack${PLAT}.a
- mkdir -p ${PHAST}/lib
- ${LN} -s $< $@
-
-${PHAST}/lib/libtmg.a: ${CLAPACKPATH}/tmglib${PLAT}.a
- mkdir -p ${PHAST}/lib
- ${LN} -s $< $@
-
-${PHAST}/lib/libblaswr.a: ${CLAPACKPATH}/blas${PLAT}.a
- mkdir -p ${PHAST}/lib
- ${LN} -s $< $@
+all: phastlib
-else # no CLAPACK: links not necessary
+sharedlib: sharedphastlib
all: phastlib
--- a/src/make-include.mk
+++ b/src/make-include.mk
@@ -120,8 +120,6 @@ ifneq ($(TARGETOS), Windows)
# PLAT is empty for windows builds
PLAT =
endif
- # F2C libraries used by CLAPACK; most users won't need to edit
- F2CPATH = ${CLAPACKPATH}/F2CLIBS
endif
# if neither VECLIB nor CLAPACKPATH is defined, then LAPACK will be
@@ -139,8 +137,7 @@ LIBS = -lphast -framework Accelerate -lc
else
ifdef CLAPACKPATH
ifneq ($(TARGETOS), Windows)
- CFLAGS += -I${CLAPACKPATH}/INCLUDE -I${F2CPATH}
- LIBS = -lphast -llapack -ltmg -lblaswr -lc -lf2c -lm
+ LIBS = -lphast -llapack -ltmglib -lblas -lc -lm
else
CFLAGS += -I${CLAPACKPATH}/INCLUDE -I${F2CPATH} -DPCRE_STATIC
LIBS = -lphast -lm ${CLAPACKPATH}/liblapack.a ${CLAPACKPATH}/libf2c.a ${CLAPACKPATH}/libblas.a
@@ -149,7 +146,6 @@ endif
# older than 3.1.1
#CFLAGS += -I${CLAPACKPATH} -I${F2CPATH}
#LIBS = -lphast -llapack -ltmg -lblaswr -lc -lF77 -lI77 -lm
-LIBPATH += -L${F2CPATH}
# bypass
else
|
