Lines 1-24
Link Here
|
1 |
--- Makefile.orig 2012-07-06 23:09:12.000000000 +0900 |
1 |
--- Makefile.orig 2012-10-09 21:08:28.000000000 +0900 |
2 |
+++ Makefile 2012-08-28 23:16:44.000000000 +0900 |
2 |
+++ Makefile 2012-10-12 21:37:18.000000000 +0900 |
3 |
@@ -203,7 +203,7 @@ |
3 |
@@ -201,7 +201,7 @@ |
4 |
netlib : |
4 |
netlib : |
5 |
|
5 |
|
6 |
else |
6 |
else |
7 |
-netlib : lapack-3.4.1 patch.for_lapack-3.4.1 $(NETLIB_LAPACK_DIR)/make.inc |
7 |
-netlib : lapack-3.4.2 patch.for_lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc |
8 |
+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc |
8 |
+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc |
9 |
ifndef NOFORTRAN |
9 |
ifndef NOFORTRAN |
10 |
-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib |
10 |
-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib |
11 |
endif |
11 |
endif |
12 |
@@ -212,7 +212,7 @@ |
12 |
@@ -210,7 +210,7 @@ |
13 |
endif |
13 |
endif |
14 |
endif |
14 |
endif |
15 |
|
15 |
|
16 |
-prof_lapack : lapack-3.4.1 $(NETLIB_LAPACK_DIR)/make.inc |
16 |
-prof_lapack : lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc |
17 |
+prof_lapack : lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc |
17 |
+prof_lapack : lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc |
18 |
-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof |
18 |
-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof |
19 |
|
19 |
|
20 |
$(NETLIB_LAPACK_DIR)/make.inc : |
20 |
$(NETLIB_LAPACK_DIR)/make.inc : |
21 |
@@ -225,7 +225,7 @@ |
21 |
@@ -223,7 +223,7 @@ |
22 |
-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc |
22 |
-@echo "LOADOPTS = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc |
23 |
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc |
23 |
-@echo "CC = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc |
24 |
-@echo "CFLAGS = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
24 |
-@echo "CFLAGS = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc |
Lines 27-47
Link Here
|
27 |
-@echo "ARCHFLAGS = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc |
27 |
-@echo "ARCHFLAGS = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc |
28 |
-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc |
28 |
-@echo "RANLIB = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc |
29 |
-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc |
29 |
-@echo "LAPACKLIB = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc |
30 |
@@ -237,24 +237,19 @@ |
30 |
@@ -235,24 +235,19 @@ |
31 |
-@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc |
31 |
-@cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc |
32 |
endif |
32 |
endif |
33 |
|
33 |
|
34 |
-lapack-3.4.1 : lapack-3.4.1.tgz |
34 |
-lapack-3.4.2 : lapack-3.4.2.tgz |
35 |
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz |
35 |
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz |
36 |
ifndef NOFORTRAN |
36 |
ifndef NOFORTRAN |
37 |
ifndef NO_LAPACK |
37 |
ifndef NO_LAPACK |
38 |
- @if test `$(MD5SUM) lapack-3.4.1.tgz | $(AWK) '{print $$1}'` = 44c3869c38c8335c2b9c2a8bb276eb55; then \ |
38 |
- @if test `$(MD5SUM) lapack-3.4.2.tgz | $(AWK) '{print $$1}'` = 61bf1a8a4469d4bdb7604f5897179478; then \ |
39 |
- echo $(TAR) zxf $< ;\ |
39 |
- echo $(TAR) zxf $< ;\ |
40 |
- $(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.1) ;\ |
40 |
- $(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.2) ;\ |
41 |
- rm -f $(NETLIB_LAPACK_DIR)/lapacke/make.inc ;\ |
41 |
- rm -f $(NETLIB_LAPACK_DIR)/lapacke/make.inc ;\ |
42 |
- else \ |
42 |
- else \ |
43 |
- rm -rf $(NETLIB_LAPACK_DIR) ;\ |
43 |
- rm -rf $(NETLIB_LAPACK_DIR) ;\ |
44 |
- echo " Cannot download lapack-3.4.1.tgz or the MD5 check sum is wrong (Please use orignal)."; \ |
44 |
- echo " Cannot download lapack-3.4.2.tgz or the MD5 check sum is wrong (Please use orignal)."; \ |
45 |
- exit 1; \ |
45 |
- exit 1; \ |
46 |
- fi |
46 |
- fi |
47 |
+ echo $(TAR) zxf $< ;\ |
47 |
+ echo $(TAR) zxf $< ;\ |
Lines 51-74
Link Here
|
51 |
endif |
51 |
endif |
52 |
endif |
52 |
endif |
53 |
|
53 |
|
54 |
-LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.1.tgz |
54 |
-LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.2.tgz |
55 |
+LAPACK_URL=http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz |
55 |
+LAPACK_URL=http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz |
56 |
|
56 |
|
57 |
-lapack-3.4.1.tgz : |
57 |
-lapack-3.4.2.tgz : |
58 |
+lapack-%%LAPACKVER%%.tgz : |
58 |
+lapack-%%LAPACKVER%%.tgz : |
59 |
ifndef NOFORTRAN |
59 |
ifndef NOFORTRAN |
60 |
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or |
60 |
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or |
61 |
ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD)) |
61 |
ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD)) |
62 |
@@ -278,7 +273,7 @@ |
62 |
@@ -276,7 +271,7 @@ |
63 |
-wget http://www.netlib.org/lapack/timing/timing.tgz |
63 |
-wget http://www.netlib.org/lapack/timing/timing.tgz |
64 |
endif |
64 |
endif |
65 |
|
65 |
|
66 |
-lapack-timing : lapack-3.4.1 large.tgz timing.tgz |
66 |
-lapack-timing : lapack-3.4.2 large.tgz timing.tgz |
67 |
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz |
67 |
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz |
68 |
ifndef NOFORTRAN |
68 |
ifndef NOFORTRAN |
69 |
(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING) |
69 |
(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING) |
70 |
(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz ) |
70 |
(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz ) |
71 |
@@ -316,4 +311,4 @@ |
71 |
@@ -314,4 +309,4 @@ |
72 |
rm -rf $(NETLIB_LAPACK_DIR) ;\ |
72 |
rm -rf $(NETLIB_LAPACK_DIR) ;\ |
73 |
fi |
73 |
fi |
74 |
@rm -f *.grd Makefile.conf_last config_last.h |
74 |
@rm -f *.grd Makefile.conf_last config_last.h |