← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/pvm/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/99-old-build-system-changes-i-have-no-idea-what-are-for.patch

  • Committer: Bazaar Package Importer
  • Author(s): Steinar H. Gunderson
  • Date: 2008-07-02 23:16:11 UTC
  • mfrom: (4.1.3 hardy)
  • Revision ID: james.westby@ubuntu.com-20080702231611-1f29qb9o1o29771f
Tags: 3.4.5-11
http://bugs.debian.org/483328
In debian/rules, pick out the version number from the changelog instead of
from the current directory name; fixes FTBFS if the directory has been
renamed for some reason. Baed on patch from Simon McVittie and Peter Green.
(Closes: #483328)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/99-old-build-system-changes-i-have-no-idea-what-are-for.patch
 
1
Index: pvm-3.4.5/Makefile
 
2
===================================================================
 
3
--- pvm-3.4.5.orig/Makefile
 
4
+++ pvm-3.4.5/Makefile
 
5
@@ -6,7 +6,7 @@
 
6
 
 
7
 SHELL  =       /bin/sh
 
8
 
 
9
-AIMKSTR        =       -here -f ./conf/`./debian/getpvmarch`.def -f ./Makefile.aimk
 
10
+AIMKSTR        =       -here -f ./conf/`./debian/getpvmarch`.def -f ./Makefile.aimk CFLOPTS=''
 
11
 
 
12
 default:
 
13
        ./lib/aimk $(AIMKSTR) default
 
14
@@ -51,3 +51,54 @@ x:
 
15
 r:
 
16
        ./lib/aimk $(AIMKSTR) r
 
17
 
 
18
+
 
19
+
 
20
+# compile for /usr/local directories
 
21
+
 
22
+local:
 
23
+       ./lib/aimk $(AIMKSTR)  CFLOPTS='"-O -DSAFETMP -DPVMDPATH=\\\"pvmd\\\" -DPVMDFILE=\\\"/usr/local/bin/pvmd\\\" -DPVM_DEFAULT_ROOT=\\\"/usr/local/lib/pvm3\\\" "' PVMDIR=`pwd` default
 
24
+
 
25
+# compile for system directories
 
26
+system:
 
27
+       ./lib/aimk $(AIMKSTR)  CFLOPTS='"-g -O2 -DSAFETMP -DPVMDPATH=\\\"pvmd\\\" -DPVMDFILE=\\\"/usr/bin/pvmd\\\" -DPVM_DEFAULT_ROOT=\\\"/usr/lib/pvm3\\\" "' PVMDIR=`pwd` default
 
28
+
 
29
+
 
30
+install-local:
 
31
+       -mkdir -p /usr/local/lib/pvm3/lib /usr/local/lib/pvm3/bin \
 
32
+               /usr/local/lib/pvm3/conf
 
33
+       cp lib/pvmgetarch lib/aimk /usr/local/lib/pvm3/lib
 
34
+       cp -pr lib/`./lib/pvmgetarch` /usr/local/lib/pvm3/lib
 
35
+       cp -pr bin/`./lib/pvmgetarch` /usr/local/lib/pvm3/bin
 
36
+       cp -pr include /usr/local/lib/pvm3/
 
37
+       cp  conf/`./lib/pvmgetarch`* /usr/local/lib/pvm3/conf
 
38
+       ln -sf /usr/local/lib/pvm3/lib/aimk /usr/local/bin
 
39
+       ln -sf /usr/local/lib/pvm3/lib/pvmgetarch /usr/local/bin
 
40
+       ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvm /usr/local/bin
 
41
+       ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvmgs /usr/local/bin
 
42
+       ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvmd3 /usr/local/bin/pvmd
 
43
+       ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvmd3 /usr/local/lib/pvm3/lib/pvmd
 
44
+       ln -sf /usr/local/lib/pvm3/lib/`./lib/pvmgetarch`/pvm /usr/local/lib/pvm3/lib/pvm
 
45
+
 
46
+install-deb:
 
47
+       -mkdir -p $(DESTDIR)/usr/lib/pvm3/lib $(DESTDIR)/usr/lib/pvm3/bin \
 
48
+               $(DESTDIR)/usr/lib/pvm3/conf
 
49
+       cp lib/pvmgetarch lib/aimk $(DESTDIR)/usr/lib/pvm3/lib
 
50
+       cp -pr lib/`./lib/pvmgetarch` $(DESTDIR)/usr/lib/pvm3/lib
 
51
+       cp -pr bin/`./lib/pvmgetarch` $(DESTDIR)/usr/lib/pvm3/bin
 
52
+       cp  conf/`./lib/pvmgetarch`* $(DESTDIR)/usr/lib/pvm3/conf
 
53
+       cp  include/* $(DESTDIR)/usr/include
 
54
+       mv $(DESTDIR)/usr/lib/pvm3/lib/aimk $(DESTDIR)/usr/bin
 
55
+       mv $(DESTDIR)/usr/lib/pvm3/lib/pvmgetarch $(DESTDIR)/usr/bin
 
56
+       ln -sf ../../../bin/pvmgetarch  $(DESTDIR)/usr/lib/pvm3/lib/pvmgetarch 
 
57
+       mv $(DESTDIR)/usr/lib/pvm3/lib/`./lib/pvmgetarch`/pvm $(DESTDIR)/usr/bin
 
58
+       mv $(DESTDIR)/usr/lib/pvm3/lib/`./lib/pvmgetarch`/pvmgs $(DESTDIR)/usr/bin
 
59
+       mv $(DESTDIR)/usr/lib/pvm3/lib/`./lib/pvmgetarch`/pvmd3 $(DESTDIR)/usr/bin/pvmd
 
60
+       ln -sf ../../../bin/pvmd  $(DESTDIR)/usr/lib/pvm3/lib/pvmd
 
61
+       ln -sf ../../../bin/pvm  $(DESTDIR)/usr/lib/pvm3/lib/pvm
 
62
+       mv $(DESTDIR)/usr/lib/pvm3/lib/`./lib/pvmgetarch`/*.a $(DESTDIR)/usr/lib
 
63
+       mv $(DESTDIR)/usr/lib/pvm3/bin/`./lib/pvmgetarch`/* $(DESTDIR)/usr/bin
 
64
+#      cp -r man/man1 $(DESTDIR)/usr/man
 
65
+#      cp -r man/man3 $(DESTDIR)/usr/man
 
66
+       tar cf - examples | gzip -9 > $(DESTDIR)/usr/share/doc/pvm-dev/examples.tar.gz
 
67
+       tar cf - gexamples | gzip -9 > $(DESTDIR)/usr/share/doc/pvm-dev/gexamples.tar.gz
 
68
+
 
69
Index: pvm-3.4.5/Makefile.aimk
 
70
===================================================================
 
71
--- pvm-3.4.5.orig/Makefile.aimk
 
72
+++ pvm-3.4.5/Makefile.aimk
 
73
@@ -34,10 +34,9 @@ SHELL                =       /bin/sh
 
74
 #
 
75
 
 
76
 PVMOPTS                =       CC="$(CC)" \
 
77
-                               F77="$(F77)"
 
78
-
 
79
-#                              CFLOPTS="$(CFLOPTS)"
 
80
-#                              FFLOPTS="$(FFLOPTS)"
 
81
+                               F77=$(F77) \
 
82
+                               CFLOPTS=$(CFLOPTS)
 
83
+                               FFLOPTS=$(FFLOPTS)
 
84
 #                              PVMDIR=$(PVMDIR)
 
85
 
 
86
 #
 
87
Index: pvm-3.4.5/console/Makefile.aimk
 
88
===================================================================
 
89
--- pvm-3.4.5.orig/console/Makefile.aimk
 
90
+++ pvm-3.4.5/console/Makefile.aimk
 
91
@@ -22,8 +22,8 @@ TRCLIB                =       pvmtrc
 
92
 LIBPREFIX      =       lib
 
93
 PVMLIBDEP      =       $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
 
94
 TRCLIBDEP      =       $(TRCLDIR)/$(LIBPREFIX)$(TRCLIB).a
 
95
-CFLAGS         =       $(CFLOPTS) -DIMA_$(PVM_ARCH) -I$(PVMIDIR) -I$(TRCIDIR) \
 
96
-                               -I$(PVMSDIR) $(ARCHCFLAGS)
 
97
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) -DIMA_$(PVM_ARCH) -I$(PVMIDIR) -I$(TRCIDIR) \
 
98
+                               -I$(PVMSDIR)
 
99
 LIBS           =       $(LOPT) -L$(TRCLDIR) -L$(PVMLDIR) \
 
100
                                -l$(TRCLIB) -l$(PVMLIB) $(ARCHLIB)
 
101
 OBJ                    =       cons.o cmds.o job.o trc.o
 
102
Index: pvm-3.4.5/examples/Makefile.aimk
 
103
===================================================================
 
104
--- pvm-3.4.5.orig/examples/Makefile.aimk
 
105
+++ pvm-3.4.5/examples/Makefile.aimk
 
106
@@ -25,7 +25,7 @@ BDIR          =       $(PVMDIR)/bin
 
107
 XDIR           =       $(BDIR)/$(PVM_ARCH)
 
108
 
 
109
 CFLOPTS                =       -g
 
110
-CFLAGS         =       $(CFLOPTS) -I$(PVMDIR)/include $(ARCHCFLAGS)
 
111
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMDIR)/include
 
112
 
 
113
 ##### Need to select some architecture-specific libraries to link tasks
 
114
 # The default setup is for workstations
 
115
Index: pvm-3.4.5/gexamples/Makefile.aimk
 
116
===================================================================
 
117
--- pvm-3.4.5.orig/gexamples/Makefile.aimk
 
118
+++ pvm-3.4.5/gexamples/Makefile.aimk
 
119
@@ -23,7 +23,7 @@ PVMIDIR       =       $(PVMDIR)/include
 
120
 PVMLDIR        =       $(PVMDIR)/lib/$(PVM_ARCH)
 
121
 PVMLIB =       $(LOPT) -L$(PVMLDIR) -lgpvm3 -lpvm3 $(ARCHLIB)
 
122
 CFLOPTS        =       -g
 
123
-CFLAGS =       $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS)
 
124
+CFLAGS =       $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR)
 
125
 SDIR   =       $(PVMDIR)/gexamples
 
126
 BDIR   =       $(PVMDIR)/bin
 
127
 XDIR   =       $(BDIR)/$(PVM_ARCH)
 
128
Index: pvm-3.4.5/hoster/Makefile.aimk
 
129
===================================================================
 
130
--- pvm-3.4.5.orig/hoster/Makefile.aimk
 
131
+++ pvm-3.4.5/hoster/Makefile.aimk
 
132
@@ -21,8 +21,7 @@ BDIR          =       $(PVMDIR)/bin
 
133
 XDIR           =       $(BDIR)/$(PVM_ARCH)
 
134
 
 
135
 CFLOPTS                =       -O
 
136
-CFLAGS         =       $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
 
137
-                               $(ARCHCFLAGS)
 
138
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH)
 
139
 LIBS           =       -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
 
140
 
 
141
 HEADERS                =       $(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h
 
142
Index: pvm-3.4.5/libfpvm/Makefile.aimk
 
143
===================================================================
 
144
--- pvm-3.4.5.orig/libfpvm/Makefile.aimk
 
145
+++ pvm-3.4.5/libfpvm/Makefile.aimk
 
146
@@ -9,9 +9,9 @@
 
147
 SHELL                  =       /bin/sh
 
148
 PVMDIR                 =       ../..
 
149
 SDIR                   =       $(PVMDIR)/libfpvm
 
150
-CFLAGS                 =       $(CFLOPTS) -c -DIMA_$(PVM_ARCH) \
 
151
+CFLAGS                 =       $(ARCHCFLAGS) $(CFLOPTS) -c -DIMA_$(PVM_ARCH) \
 
152
                                        -I$(SDIR) -I$(PVMDIR)/include -I$(PVMDIR)/src \
 
153
-                                       $(CDEBUGFLAGS) $(ARCHCFLAGS)
 
154
+                                       $(CDEBUGFLAGS)
 
155
 RM                             =       rm -f
 
156
 M4                             =       m4
 
157
 M4FILE                 =       $(PVMDIR)/conf/$(PVM_ARCH).m4
 
158
Index: pvm-3.4.5/pvmgs/Makefile.aimk
 
159
===================================================================
 
160
--- pvm-3.4.5.orig/pvmgs/Makefile.aimk
 
161
+++ pvm-3.4.5/pvmgs/Makefile.aimk
 
162
@@ -32,8 +32,7 @@ PVMLIBDEP     =       $(PVMLDIR)/$(LIBPREFIX)$(PVM
 
163
 # server requests, where XXX is the number of seconds for the timeout.
 
164
 # (Note: this flag can also be added to the ARCHCFLAGS define in the
 
165
 # PVM conf file, i.e.:  $PVM_ROOT/conf/$PVM_ARCH.def )
 
166
-CFLAGS         =       $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
 
167
-                               $(ARCHCFLAGS)
 
168
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH)
 
169
 
 
170
 LIBS           =       $(LOPT) -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
 
171
 
 
172
Index: pvm-3.4.5/rm/Makefile.aimk
 
173
===================================================================
 
174
--- pvm-3.4.5.orig/rm/Makefile.aimk
 
175
+++ pvm-3.4.5/rm/Makefile.aimk
 
176
@@ -26,9 +26,8 @@ BDIR          =       $(PVMDIR)/bin
 
177
 XDIR           =       $(BDIR)/$(PVM_ARCH)
 
178
 
 
179
 CFLOPTS                =       -g
 
180
-CFLAGS         =       $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \
 
181
-                               -DIMA_$(PVM_ARCH) $(ARCHCFLAGS) \
 
182
-                       $(DEBUG_FLAGS)
 
183
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \
 
184
+                               -DIMA_$(PVM_ARCH) $(DEBUG_FLAGS)
 
185
 LIBS           =       -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
 
186
 
 
187
 HEADERS                =       $(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h $(SDIR)/srm.h
 
188
Index: pvm-3.4.5/src/Makefile.aimk
 
189
===================================================================
 
190
--- pvm-3.4.5.orig/src/Makefile.aimk
 
191
+++ pvm-3.4.5/src/Makefile.aimk
 
192
@@ -68,9 +68,8 @@ CFLOPTS               =       -O
 
193
 #OPTIONS       =       -p
 
194
 OPTIONS                =       -DCLUMP_ALLOC -DSTATISTICS \
 
195
                                -DTIMESTAMPLOG -DSANITY
 
196
-CFLAGS         =       $(CFLOPTS) $(OPTIONS) -I$(PVMDIR)/include \
 
197
-                               -DARCHCLASS=\"$(PVM_ARCH)\" -DIMA_$(PVM_ARCH) \
 
198
-                               $(ARCHCFLAGS)
 
199
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) $(OPTIONS) -I$(PVMDIR)/include \
 
200
+                               -DARCHCLASS=\"$(PVM_ARCH)\" -DIMA_$(PVM_ARCH)
 
201
 
 
202
 LIBPREFIX      =       lib
 
203
 LIBPVM         =       $(LIBPREFIX)pvm3
 
204
@@ -96,27 +95,19 @@ DOBJ                = \
 
205
        ddpro.o \
 
206
        host.o \
 
207
        hoster.o \
 
208
-       imalloc.o \
 
209
        msgbox.o \
 
210
        pkt.o \
 
211
-       pmsg.o \
 
212
-       pvmalloc.o \
 
213
-       pvmcruft.o \
 
214
        pvmd.o \
 
215
+       pvmcruft.o \
 
216
        pvmdpack.o \
 
217
        pvmdtev.o \
 
218
-       pvmerr.o \
 
219
-       pvmfrag.o \
 
220
        pvmlog.o \
 
221
        sdpro.o \
 
222
        task.o \
 
223
-       tdpro.o \
 
224
-       waitc.o \
 
225
        global.o \
 
226
-       $(REGEXOBJS)
 
227
+       tdpro.o
 
228
 
 
229
 SOCKDOBJ       = \
 
230
-       pvmdabuf.o \
 
231
        pvmdunix.o
 
232
 
 
233
 SHMEMDOBJ      = \
 
234
Index: pvm-3.4.5/tasker/Makefile.aimk
 
235
===================================================================
 
236
--- pvm-3.4.5.orig/tasker/Makefile.aimk
 
237
+++ pvm-3.4.5/tasker/Makefile.aimk
 
238
@@ -19,8 +19,8 @@ BDIR          =       $(PVMDIR)/bin
 
239
 XDIR           =       $(BDIR)/$(PVM_ARCH)
 
240
 
 
241
 CFLOPTS                =       -g
 
242
-CFLAGS         =       $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \
 
243
-                               -DIMA_$(PVM_ARCH) $(ARCHCFLAGS)
 
244
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) $(ARCHCFLAGS) \
 
245
+                               -DIMA_$(PVM_ARCH)
 
246
 LIBS           =       -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
 
247
 
 
248
 HEADERS                =       $(PVMIDIR)/pvm3.h $(PVMIDIR)/pvmproto.h
 
249
Index: pvm-3.4.5/tracer/Makefile.aimk
 
250
===================================================================
 
251
--- pvm-3.4.5.orig/tracer/Makefile.aimk
 
252
+++ pvm-3.4.5/tracer/Makefile.aimk
 
253
@@ -22,7 +22,7 @@ CFLOPTS               =       -O
 
254
 #CC                    =       cc
 
255
 #CC                    =       gcc
 
256
 
 
257
-CFLAGS         =       $(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH) $(ARCHCFLAGS)
 
258
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) $(PVMVERSION) -DIMA_$(PVM_ARCH)
 
259
 
 
260
 
 
261
 #
 
262
Index: pvm-3.4.5/xep/Makefile.aimk
 
263
===================================================================
 
264
--- pvm-3.4.5.orig/xep/Makefile.aimk
 
265
+++ pvm-3.4.5/xep/Makefile.aimk
 
266
@@ -20,8 +20,8 @@ BDIR          =       $(PVMDIR)/bin
 
267
 XDIR           =       $(BDIR)/$(PVM_ARCH)
 
268
 
 
269
 #CFLOPTS       =       -O
 
270
-CFLOPTS                =       -g
 
271
-CFLAGS         =       $(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR) $(ARCHCFLAGS)
 
272
+#CFLOPTS               =       -g
 
273
+CFLAGS         =       $(ARCHCFLAGS) $(CFLOPTS) -I$(PVMIDIR) -L$(PVMLDIR)
 
274
 LIBS           =       -l$(PVMLIB) $(ARCHLIB) $(OS2XEPLIBS)
 
275
 XLIBS          =       -lXaw -lXmu -lXext -lXt -lX11
 
276
 XCFLAGS                =       -I/usr/local/X11R5/include -I/usr/local/X11/include \