Package: spooles / 2.2-14

makefiles.patch Patch series | download
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
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
Description: Makefiles
Index: spooles/Make.inc
===================================================================
--- spooles.orig/Make.inc
+++ spooles/Make.inc
@@ -7,12 +7,14 @@
 #
 #----------------------------------------
 #
+DEB_HOST_MULTIARCH=$(shell dpkg-architecture -q DEB_HOST_MULTIARCH)
+#
 #  place your favorite compiler here
 #
 # for solaris
 #
 # CC = gcc
-  CC = /usr/lang-4.0/bin/cc
+#  CC = /usr/lang-4.0/bin/cc
 #
 # for sgi
 #
@@ -28,7 +30,7 @@
 # 
 # OPTLEVEL = 
 # OPTLEVEL = -g -v
-  OPTLEVEL = -O
+  OPTLEVEL = -O2
 # OPTLEVEL = -xO5 -v
 # OPTLEVEL = -O3
 # OPTLEVEL = -O4
@@ -43,7 +45,7 @@
 #  set any load flags
 #
 #  LDFLAGS = -Wl,+parallel -Wl,+tm,spp2000 # for hp exemplar
-   LDFLAGS =
+#   LDFLAGS =
 #
 #---------------------------------------------------------------------
 #
@@ -103,7 +105,7 @@
 #  MPI install library
 #
 # MPI_INSTALL_DIR = 
-  MPI_INSTALL_DIR = /usr/local/mpich-1.0.13
+  MPI_INSTALL_DIR = /usr/lib/$(DEB_HOST_MULTIARCH)
 #
 #---------------------------------------------------------------------
 #
@@ -115,7 +117,7 @@
 #
 # for solaris
 #
-  MPI_LIB_PATH = -L$(MPI_INSTALL_DIR)/lib/solaris/ch_p4
+  MPI_LIB_PATH = -L$(MPI_INSTALL_DIR)
 #
 # for hp
 #
@@ -142,6 +144,6 @@
 #  MPI include path
 #
 # MPI_INCLUDE_DIR = 
-  MPI_INCLUDE_DIR = -I$(MPI_INSTALL_DIR)/include
+  MPI_INCLUDE_DIR = -I/usr/include/$(DEB_HOST_MULTIARCH)/mpi
 #
 #---------------------------------------------------------------------
Index: spooles/MPI/makefile
===================================================================
--- spooles.orig/MPI/makefile
+++ spooles/MPI/makefile
@@ -2,7 +2,7 @@ all_drivers :
 	cd drivers ; make drivers
 
 lib :
-	cd src ; make spoolesMPI.a
+	cd src ; make makeLib
 
 clean :
 	cd src ; make clean
Index: spooles/MPI/src/makefile
===================================================================
--- spooles.orig/MPI/src/makefile
+++ spooles/MPI/src/makefile
@@ -42,3 +42,8 @@ $(OBJ).a : \
 
 clean :
 	- rm -f *.a *.o
+
+makeLib :
+	perl ../../makeLib > makeG
+	make -f makeG
+	rm -f makeG
Index: spooles/MT/makefile
===================================================================
--- spooles.orig/MT/makefile
+++ spooles/MT/makefile
@@ -2,7 +2,7 @@ all_drivers :
 	cd drivers ; make drivers
 
 lib :
-	cd src ; make spoolesMT.a
+	cd src ; make makeLib
 
 clean :
 	cd src ; make clean