|
1 diff -r -u /tmp/ibutils-1.5.7/config/osm.m4 ibutils-1.5.7/config/osm.m4 |
|
2 --- /tmp/ibutils-1.5.7/config/osm.m4 Thu Feb 18 03:31:34 2010 |
|
3 +++ ibutils-1.5.7/config/osm.m4 Thu Feb 24 16:51:16 2011 |
|
4 @@ -179,7 +179,7 @@ |
|
5 osm_debug_flags= |
|
6 fi |
|
7 |
|
8 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" |
|
9 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1" |
|
10 else |
|
11 dnl dummy values |
|
12 with_osm=disabled |
|
13 diff -r -u /tmp/ibutils-1.5.7/ibdiag/doc/ibdiagnet.pod ibutils-1.5.7/ibdiag/doc/ibdiagnet.pod |
|
14 --- /tmp/ibutils-1.5.7/ibdiag/doc/ibdiagnet.pod Mon Nov 1 16:03:43 2010 |
|
15 +++ ibutils-1.5.7/ibdiag/doc/ibdiagnet.pod Thu Jun 2 12:30:13 2011 |
|
16 @@ -122,7 +122,6 @@ |
|
17 |
|
18 =over |
|
19 |
|
20 -=item |
|
21 Min number of packets to be sent across each link (default = 10) |
|
22 |
|
23 =back |
|
24 @@ -131,7 +130,6 @@ |
|
25 |
|
26 =over |
|
27 |
|
28 -=item |
|
29 Enable verbose mode |
|
30 |
|
31 =back |
|
32 @@ -140,7 +138,6 @@ |
|
33 |
|
34 =over |
|
35 |
|
36 -=item |
|
37 Provides a report of the fabric qualities |
|
38 |
|
39 =back |
|
40 @@ -149,7 +146,6 @@ |
|
41 |
|
42 =over |
|
43 |
|
44 -=item |
|
45 Credit loop check based on UpDown rules |
|
46 |
|
47 =back |
|
48 @@ -158,7 +154,6 @@ |
|
49 |
|
50 =over |
|
51 |
|
52 -=item |
|
53 Specifies the topology file name |
|
54 |
|
55 =back |
|
56 @@ -167,7 +162,6 @@ |
|
57 |
|
58 =over |
|
59 |
|
60 -=item |
|
61 Specifies the local system name. Meaningful only if a topology file is specified |
|
62 |
|
63 =back |
|
64 @@ -176,7 +170,6 @@ |
|
65 |
|
66 =over |
|
67 |
|
68 -=item |
|
69 Specifies the index of the device of the port used to connect to the IB fabric (in case of multiple devices on the local system) |
|
70 |
|
71 =back |
|
72 @@ -185,7 +178,6 @@ |
|
73 |
|
74 =over |
|
75 |
|
76 -=item |
|
77 Specifies the local device's port num used to connect to the IB fabric |
|
78 |
|
79 =back |
|
80 @@ -194,7 +186,6 @@ |
|
81 |
|
82 =over |
|
83 |
|
84 -=item |
|
85 Specifies the directory where the output files will be placed (default = /tmp) |
|
86 |
|
87 =back |
|
88 @@ -203,7 +194,6 @@ |
|
89 |
|
90 =over |
|
91 |
|
92 -=item |
|
93 Specifies the expected link width |
|
94 |
|
95 =back |
|
96 @@ -212,7 +202,6 @@ |
|
97 |
|
98 =over |
|
99 |
|
100 -=item |
|
101 Specifies the expected link speed |
|
102 |
|
103 =back |
|
104 @@ -221,7 +210,6 @@ |
|
105 |
|
106 =over |
|
107 |
|
108 -=item |
|
109 Dump all the fabric links, pm Counters into ibdiagnet.pm |
|
110 |
|
111 =back |
|
112 @@ -230,7 +218,6 @@ |
|
113 |
|
114 =over |
|
115 |
|
116 -=item |
|
117 Reset all the fabric links pmCounters |
|
118 |
|
119 =back |
|
120 @@ -239,7 +226,6 @@ |
|
121 |
|
122 =over |
|
123 |
|
124 -=item |
|
125 If any of the provided pm is greater then its provided value, print it to screen |
|
126 |
|
127 =back |
|
128 @@ -248,7 +234,6 @@ |
|
129 |
|
130 =over |
|
131 |
|
132 -=item |
|
133 Skip the executions of the selected checks. |
|
134 Skip options (one or more can be specified) : dup_guids zero_guids pm logical_state part ipoib all |
|
135 |
|
136 @@ -258,7 +243,6 @@ |
|
137 |
|
138 =over |
|
139 |
|
140 -=item |
|
141 Write out the discovered topology into the given file. This flag is useful if you later want to check for changes from the current state of the fabric. |
|
142 A directory named ibdiag_ibnl is also created by this option, and holds the IBNL files required to load this topology. To use these files you will need to set the environment variable named IBDM_IBNL_PATH to that directory. The directory is located in /tmp or in the output directory provided by the -o flag. |
|
143 |
|
144 @@ -268,7 +252,6 @@ |
|
145 |
|
146 =over |
|
147 |
|
148 -=item |
|
149 Load subnet data from the given .db file, and skip subnet discovery stage. |
|
150 Note: Some of the checks require actual subnet discovery, and therefore would not run when load_db is specified. These checks are |
|
151 : Duplicated/zero guids, link state, SMs status. |
|
152 @@ -279,7 +262,6 @@ |
|
153 |
|
154 =over |
|
155 |
|
156 -=item |
|
157 VL based Routing - provide this option to create the paths SL file (psl), SL2VL file (slvl) |
|
158 and use them in credit loops check (if -r option is provided). |
|
159 |
|
160 @@ -291,7 +273,6 @@ |
|
161 |
|
162 =over |
|
163 |
|
164 -=item |
|
165 Prints the help page information |
|
166 |
|
167 =back |
|
168 @@ -300,7 +281,6 @@ |
|
169 |
|
170 =over |
|
171 |
|
172 -=item |
|
173 Prints the version of the tool |
|
174 |
|
175 =back |
|
176 @@ -309,7 +289,6 @@ |
|
177 |
|
178 =over |
|
179 |
|
180 -=item |
|
181 Prints the tool's environment variables and their values |
|
182 |
|
183 =back |
|
184 diff -r -u /tmp/ibutils-1.5.7/ibdiag/doc/Makefile.in ibutils-1.5.7/ibdiag/doc/Makefile.in |
|
185 --- /tmp/ibutils-1.5.7/ibdiag/doc/Makefile.in Tue Mar 8 03:09:32 2011 |
|
186 +++ ibutils-1.5.7/ibdiag/doc/Makefile.in Thu Feb 24 16:51:16 2011 |
|
187 @@ -52,7 +52,7 @@ |
|
188 pkglibdir = $(libdir)/@PACKAGE@ |
|
189 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
190 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
191 -install_sh_DATA = $(install_sh) -c -m 644 |
|
192 +install_sh_DATA = $(install_sh) -c -m 744 |
|
193 install_sh_PROGRAM = $(install_sh) -c |
|
194 install_sh_SCRIPT = $(install_sh) -c |
|
195 INSTALL_HEADER = $(INSTALL_DATA) |
|
196 diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/Makefile.in ibutils-1.5.7/ibdiag/src/Makefile.in |
|
197 --- /tmp/ibutils-1.5.7/ibdiag/src/Makefile.in Tue Mar 8 03:09:32 2011 |
|
198 +++ ibutils-1.5.7/ibdiag/src/Makefile.in Thu Feb 24 16:51:16 2011 |
|
199 @@ -53,7 +53,7 @@ |
|
200 pkglibdir = $(libdir)/@PACKAGE@ |
|
201 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
202 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
203 -install_sh_DATA = $(install_sh) -c -m 644 |
|
204 +install_sh_DATA = $(install_sh) -c -m 744 |
|
205 install_sh_PROGRAM = $(install_sh) -c |
|
206 install_sh_SCRIPT = $(install_sh) -c |
|
207 INSTALL_HEADER = $(INSTALL_DATA) |
|
208 @@ -96,7 +96,7 @@ |
|
209 am__base_list = \ |
|
210 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
211 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
212 -am__installdirs = "$(DESTDIR)$(bindir)" |
|
213 +am__installdirs = "$(DESTDIR)$(sbindir)" |
|
214 SCRIPTS = $(bin_SCRIPTS) |
|
215 SOURCES = |
|
216 DIST_SOURCES = |
|
217 @@ -224,8 +224,8 @@ |
|
218 $(am__aclocal_m4_deps): |
|
219 install-binSCRIPTS: $(bin_SCRIPTS) |
|
220 @$(NORMAL_INSTALL) |
|
221 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
222 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
|
223 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
224 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ |
|
225 for p in $$list; do \ |
|
226 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
|
227 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
|
228 @@ -243,19 +243,19 @@ |
|
229 while read type dir files; do \ |
|
230 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
231 test -z "$$files" || { \ |
|
232 - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
233 - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
234 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
235 + $(INSTALL_SCRIPT) -m 755 $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
236 } \ |
|
237 ; done |
|
238 |
|
239 uninstall-binSCRIPTS: |
|
240 @$(NORMAL_UNINSTALL) |
|
241 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ |
|
242 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \ |
|
243 files=`for p in $$list; do echo "$$p"; done | \ |
|
244 sed -e 's,.*/,,;$(transform)'`; \ |
|
245 test -n "$$list" || exit 0; \ |
|
246 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
247 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
248 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
249 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
250 tags: TAGS |
|
251 TAGS: |
|
252 |
|
253 @@ -297,7 +297,7 @@ |
|
254 check: check-am |
|
255 all-am: Makefile $(SCRIPTS) |
|
256 installdirs: |
|
257 - for dir in "$(DESTDIR)$(bindir)"; do \ |
|
258 + for dir in "$(DESTDIR)$(sbindir)"; do \ |
|
259 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
260 done |
|
261 install: install-am |
|
262 @@ -426,6 +426,7 @@ |
|
263 sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \ |
|
264 -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \ |
|
265 -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \ |
|
266 + -e 's=%with_ibis_sbindir%='$(DESTDIR)$(sbindir)'=' \ |
|
267 -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagnet.in > ibdiagnet |
|
268 |
|
269 ibdiagpath: ibdiagpath.in |
|
270 @@ -432,6 +433,7 @@ |
|
271 sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \ |
|
272 -e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \ |
|
273 -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \ |
|
274 + -e 's=%with_ibis_sbindir%='$(DESTDIR)$(sbindir)'=' \ |
|
275 -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagpath.in > ibdiagpath |
|
276 |
|
277 ibdiagui: ibdiagui.in |
|
278 @@ -440,6 +442,7 @@ |
|
279 -e 's=%with_tk_lib%='$(with_tk_lib)'=' \ |
|
280 -e 's=%with_graphviz_lib%='$(with_graphviz_lib)'=' \ |
|
281 -e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \ |
|
282 + -e 's=%with_ibis_sbindir%='$(DESTDIR)$(sbindir)'=' \ |
|
283 -e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagui.in > ibdiagui |
|
284 |
|
285 clean: |
|
286 diff -r -u /tmp/ibutils-1.5.7/ibdiag/Makefile.in ibutils-1.5.7/ibdiag/Makefile.in |
|
287 --- /tmp/ibutils-1.5.7/ibdiag/Makefile.in Tue Mar 8 03:09:32 2011 |
|
288 +++ ibutils-1.5.7/ibdiag/Makefile.in Thu Feb 24 16:51:16 2011 |
|
289 @@ -54,7 +54,7 @@ |
|
290 pkglibdir = $(libdir)/@PACKAGE@ |
|
291 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
292 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
293 -install_sh_DATA = $(install_sh) -c -m 644 |
|
294 +install_sh_DATA = $(install_sh) -c -m 744 |
|
295 install_sh_PROGRAM = $(install_sh) -c |
|
296 install_sh_SCRIPT = $(install_sh) -c |
|
297 INSTALL_HEADER = $(INSTALL_DATA) |
|
298 diff -r -u /tmp/ibutils-1.5.7/ibdiag/configure ibutils-1.5.7/ibdiag/configure |
|
299 --- /tmp/ibutils-1.5.7/ibdiag/configure Tue Mar 8 03:09:33 2011 |
|
300 +++ ibutils-1.5.7/ibdiag/configure Thu Mar 10 18:33:24 2011 |
|
301 @@ -1811,7 +1811,7 @@ |
|
302 |
|
303 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
|
304 |
|
305 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
|
306 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744' |
|
307 |
|
308 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
|
309 $as_echo_n "checking whether build environment is sane... " >&6; } |
|
310 diff -r -u /tmp/ibutils-1.5.7/ibdm/Clusters/Makefile.in ibutils-1.5.7/ibdm/Clusters/Makefile.in |
|
311 --- /tmp/ibutils-1.5.7/ibdm/Clusters/Makefile.in Tue Mar 8 03:09:40 2011 |
|
312 +++ ibutils-1.5.7/ibdm/Clusters/Makefile.in Thu Feb 24 16:51:16 2011 |
|
313 @@ -53,7 +53,7 @@ |
|
314 pkglibdir = $(libdir)/@PACKAGE@ |
|
315 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
316 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
317 -install_sh_DATA = $(install_sh) -c -m 644 |
|
318 +install_sh_DATA = $(install_sh) -c -m 744 |
|
319 install_sh_PROGRAM = $(install_sh) -c |
|
320 install_sh_SCRIPT = $(install_sh) -c |
|
321 INSTALL_HEADER = $(INSTALL_DATA) |
|
322 diff -r -u /tmp/ibutils-1.5.7/ibdm/aclocal.m4 ibutils-1.5.7/ibdm/aclocal.m4 |
|
323 --- /tmp/ibutils-1.5.7/ibdm/aclocal.m4 Tue Mar 8 03:09:38 2011 |
|
324 +++ ibutils-1.5.7/ibdm/aclocal.m4 Thu Feb 24 16:51:16 2011 |
|
325 @@ -1389,7 +1389,7 @@ |
|
326 |
|
327 # Determine commands to create old-style static archives. |
|
328 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
|
329 -old_postinstall_cmds='chmod 644 $oldlib' |
|
330 +old_postinstall_cmds='chmod 744 $oldlib' |
|
331 old_postuninstall_cmds= |
|
332 |
|
333 if test -n "$RANLIB"; then |
|
334 @@ -2610,6 +2610,23 @@ |
|
335 hardcode_into_libs=yes |
|
336 # ldd complains unless libraries are executable |
|
337 postinstall_cmds='chmod +x $lib' |
|
338 + if echo "$CFLAGS" | grep '\-m64' >/dev/null ; then |
|
339 + sys_lib_search_path_spec=`$CC -m64 -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
|
340 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
|
341 + |
|
342 + solaris_arch=`uname -p` |
|
343 + if [ $solaris_arch = "i386" ]; then |
|
344 + lib64=amd64 |
|
345 + else |
|
346 + lib64=sparcv9 |
|
347 + fi |
|
348 + |
|
349 + if ! echo "$sys_lib_search_path_spec" | grep $lib64 >/dev/null ; then |
|
350 + solaris_lib64path=`echo "$sys_lib_search_path_spec" | $SED -e "s/ /$lib64\/ /g" | cut -d " " -f2-` |
|
351 + solaris_lib64path="$solaris_lib64path""$lib64"/ |
|
352 + sys_lib_search_path_spec="$solaris_lib64path $sys_lib_search_path_spec" |
|
353 + fi |
|
354 + fi |
|
355 ;; |
|
356 |
|
357 sunos4*) |
|
358 diff -r -u /tmp/ibutils-1.5.7/ibdm/doc/Makefile.in ibutils-1.5.7/ibdm/doc/Makefile.in |
|
359 --- /tmp/ibutils-1.5.7/ibdm/doc/Makefile.in Tue Mar 8 03:09:41 2011 |
|
360 +++ ibutils-1.5.7/ibdm/doc/Makefile.in Thu Feb 24 16:51:17 2011 |
|
361 @@ -52,7 +52,7 @@ |
|
362 pkglibdir = $(libdir)/@PACKAGE@ |
|
363 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
364 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
365 -install_sh_DATA = $(install_sh) -c -m 644 |
|
366 +install_sh_DATA = $(install_sh) -c -m 744 |
|
367 install_sh_PROGRAM = $(install_sh) -c |
|
368 install_sh_SCRIPT = $(install_sh) -c |
|
369 INSTALL_HEADER = $(INSTALL_DATA) |
|
370 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibnl/Makefile.in ibutils-1.5.7/ibdm/ibnl/Makefile.in |
|
371 --- /tmp/ibutils-1.5.7/ibdm/ibnl/Makefile.in Tue Mar 8 03:09:41 2011 |
|
372 +++ ibutils-1.5.7/ibdm/ibnl/Makefile.in Thu Feb 24 16:51:17 2011 |
|
373 @@ -53,7 +53,7 @@ |
|
374 pkglibdir = $(libdir)/@PACKAGE@ |
|
375 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
376 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
377 -install_sh_DATA = $(install_sh) -c -m 644 |
|
378 +install_sh_DATA = $(install_sh) -c -m 744 |
|
379 install_sh_PROGRAM = $(install_sh) -c |
|
380 install_sh_SCRIPT = $(install_sh) -c |
|
381 INSTALL_HEADER = $(INSTALL_DATA) |
|
382 diff -r -u /tmp/ibutils-1.5.7/ibdm/src/Makefile.in ibutils-1.5.7/ibdm/src/Makefile.in |
|
383 --- /tmp/ibutils-1.5.7/ibdm/src/Makefile.in Tue Mar 8 03:09:41 2011 |
|
384 +++ ibutils-1.5.7/ibdm/src/Makefile.in Thu Feb 24 16:51:17 2011 |
|
385 @@ -57,7 +57,7 @@ |
|
386 pkglibdir = $(libdir)/@PACKAGE@ |
|
387 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
388 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
389 -install_sh_DATA = $(install_sh) -c -m 644 |
|
390 +install_sh_DATA = $(install_sh) -c -m 744 |
|
391 install_sh_PROGRAM = $(install_sh) -c |
|
392 install_sh_SCRIPT = $(install_sh) -c |
|
393 INSTALL_HEADER = $(INSTALL_DATA) |
|
394 @@ -105,7 +105,7 @@ |
|
395 am__base_list = \ |
|
396 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
397 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
398 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ |
|
399 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \ |
|
400 "$(DESTDIR)$(pkgincludedir)" |
|
401 LTLIBRARIES = $(lib_LTLIBRARIES) |
|
402 libibsysapi_la_DEPENDENCIES = |
|
403 @@ -369,8 +369,8 @@ |
|
404 $(libibsysapi_la_LINK) -rpath $(libdir) $(libibsysapi_la_OBJECTS) $(libibsysapi_la_LIBADD) $(LIBS) |
|
405 install-binPROGRAMS: $(bin_PROGRAMS) |
|
406 @$(NORMAL_INSTALL) |
|
407 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
408 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
409 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
410 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
411 for p in $$list; do echo "$$p $$p"; done | \ |
|
412 sed 's/$(EXEEXT)$$//' | \ |
|
413 while read p p1; do if test -f $$p || test -f $$p1; \ |
|
414 @@ -387,20 +387,20 @@ |
|
415 while read type dir files; do \ |
|
416 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
417 test -z "$$files" || { \ |
|
418 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
419 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
420 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
421 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
422 } \ |
|
423 ; done |
|
424 |
|
425 uninstall-binPROGRAMS: |
|
426 @$(NORMAL_UNINSTALL) |
|
427 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
428 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
429 files=`for p in $$list; do echo "$$p"; done | \ |
|
430 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
|
431 -e 's/$$/$(EXEEXT)/' `; \ |
|
432 test -n "$$list" || exit 0; \ |
|
433 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
434 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
435 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
436 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
437 |
|
438 clean-binPROGRAMS: |
|
439 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
440 @@ -573,7 +573,7 @@ |
|
441 install-binPROGRAMS: install-libLTLIBRARIES |
|
442 |
|
443 installdirs: |
|
444 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
445 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
446 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
447 done |
|
448 install: install-am |
|
449 diff -r -u /tmp/ibutils-1.5.7/ibdm/Makefile.in ibutils-1.5.7/ibdm/Makefile.in |
|
450 --- /tmp/ibutils-1.5.7/ibdm/Makefile.in Tue Mar 8 03:09:42 2011 |
|
451 +++ ibutils-1.5.7/ibdm/Makefile.in Thu Feb 24 16:51:16 2011 |
|
452 @@ -54,7 +54,7 @@ |
|
453 pkglibdir = $(libdir)/@PACKAGE@ |
|
454 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
455 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
456 -install_sh_DATA = $(install_sh) -c -m 644 |
|
457 +install_sh_DATA = $(install_sh) -c -m 744 |
|
458 install_sh_PROGRAM = $(install_sh) -c |
|
459 install_sh_SCRIPT = $(install_sh) -c |
|
460 INSTALL_HEADER = $(INSTALL_DATA) |
|
461 diff -r -u /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.am ibutils-1.5.7/ibdm/scripts/Makefile.am |
|
462 --- /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.am Mon Nov 1 16:03:44 2010 |
|
463 +++ ibutils-1.5.7/ibdm/scripts/Makefile.am Thu Feb 24 16:51:17 2011 |
|
464 @@ -37,5 +37,5 @@ |
|
465 EXTRA_DIST = $(pkgdata_DATA) |
|
466 |
|
467 install-data-am: |
|
468 - for s in $(pkgdata_DATA); do cp $$s $(DESTDIR)$(bindir)/; done |
|
469 + for s in $(pkgdata_DATA); do cp $$s $(DESTDIR)$(sbindir)/; done |
|
470 |
|
471 diff -r -u /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.in ibutils-1.5.7/ibdm/scripts/Makefile.in |
|
472 --- /tmp/ibutils-1.5.7/ibdm/scripts/Makefile.in Tue Mar 8 03:09:41 2011 |
|
473 +++ ibutils-1.5.7/ibdm/scripts/Makefile.in Thu Feb 24 16:51:17 2011 |
|
474 @@ -53,7 +53,7 @@ |
|
475 pkglibdir = $(libdir)/@PACKAGE@ |
|
476 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
477 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
478 -install_sh_DATA = $(install_sh) -c -m 644 |
|
479 +install_sh_DATA = $(install_sh) -c -m 744 |
|
480 install_sh_PROGRAM = $(install_sh) -c |
|
481 install_sh_SCRIPT = $(install_sh) -c |
|
482 INSTALL_HEADER = $(INSTALL_DATA) |
|
483 @@ -447,7 +447,7 @@ |
|
484 |
|
485 |
|
486 install-data-am: |
|
487 - for s in $(pkgdata_DATA); do cp $$s $(DESTDIR)$(bindir)/; done |
|
488 + for s in $(pkgdata_DATA); do cp $$s $(DESTDIR)$(sbindir)/; done |
|
489 |
|
490 # Tell versions [3.59,3.63) of GNU make to not export all variables. |
|
491 # Otherwise a system limit (for SysV at least) may be exceeded. |
|
492 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.h ibutils-1.5.7/ibdm/ibdm/Fabric.h |
|
493 --- /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.h Thu Oct 7 07:29:56 2010 |
|
494 +++ ibutils-1.5.7/ibdm/ibdm/Fabric.h Thu Feb 24 16:51:17 2011 |
|
495 @@ -54,6 +54,7 @@ |
|
496 #include <iostream> |
|
497 #include <sstream> |
|
498 #include <string> |
|
499 +#include <cstring> |
|
500 #include <stdio.h> |
|
501 #include <stdlib.h> |
|
502 #include <string.h> |
|
503 @@ -69,7 +70,7 @@ |
|
504 |
|
505 #if __WORDSIZE == 64 |
|
506 #define PRIx64 "lx" |
|
507 -#else |
|
508 +#elseif !defined(__SVR4) || !defined(__sun) |
|
509 #define PRIx64 "llx" |
|
510 #endif |
|
511 using namespace std; |
|
512 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/TopoMatch.cpp ibutils-1.5.7/ibdm/ibdm/TopoMatch.cpp |
|
513 --- /tmp/ibutils-1.5.7/ibdm/ibdm/TopoMatch.cpp Mon Nov 1 16:03:44 2010 |
|
514 +++ ibutils-1.5.7/ibdm/ibdm/TopoMatch.cpp Thu Feb 24 16:51:17 2011 |
|
515 @@ -57,6 +57,9 @@ |
|
516 #include "Regexp.h" |
|
517 #include <iomanip> |
|
518 #include <sstream> |
|
519 +#if defined(__SVR4) && defined(__sun) |
|
520 +#include <strings.h> |
|
521 +#endif |
|
522 |
|
523 |
|
524 ////////////////////////////////////////////////////////////////////////////// |
|
525 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/Makefile.in ibutils-1.5.7/ibdm/ibdm/Makefile.in |
|
526 --- /tmp/ibutils-1.5.7/ibdm/ibdm/Makefile.in Tue Mar 8 03:09:41 2011 |
|
527 +++ ibutils-1.5.7/ibdm/ibdm/Makefile.in Thu Feb 24 16:51:17 2011 |
|
528 @@ -55,7 +55,7 @@ |
|
529 pkglibdir = $(libdir)/@PACKAGE@ |
|
530 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
531 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
532 -install_sh_DATA = $(install_sh) -c -m 644 |
|
533 +install_sh_DATA = $(install_sh) -c -m 744 |
|
534 install_sh_PROGRAM = $(install_sh) -c |
|
535 install_sh_SCRIPT = $(install_sh) -c |
|
536 INSTALL_HEADER = $(INSTALL_DATA) |
|
537 @@ -102,7 +102,7 @@ |
|
538 am__base_list = \ |
|
539 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
540 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
541 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ |
|
542 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \ |
|
543 "$(DESTDIR)$(pkgincludedir)" |
|
544 LTLIBRARIES = $(lib_LTLIBRARIES) |
|
545 am__DEPENDENCIES_1 = |
|
546 @@ -316,7 +316,7 @@ |
|
547 AM_CFLAGS = $(DBG) $(IBNL_PATH) $(TCL_CFLAGS) |
|
548 lib_LTLIBRARIES = libibdmcom.la libibdm.la |
|
549 libibdmcom_la_SOURCES = $(common_SOURCES) |
|
550 -libibdmcom_la_LIBADD = |
|
551 +libibdmcom_la_LIBADD = $(TCL_LIBS) |
|
552 libibdmcom_la_LDFLAGS = -version-info $(LIB_VER_TRIPLET) |
|
553 libibdm_la_SOURCES = ibdm_wrap.cpp ibdm.i $(common_SOURCES) |
|
554 libibdm_la_LIBADD = $(TCL_LIBS) |
|
555 @@ -402,8 +402,8 @@ |
|
556 $(libibdmcom_la_LINK) -rpath $(libdir) $(libibdmcom_la_OBJECTS) $(libibdmcom_la_LIBADD) $(LIBS) |
|
557 install-binPROGRAMS: $(bin_PROGRAMS) |
|
558 @$(NORMAL_INSTALL) |
|
559 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
560 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
561 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
562 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
563 for p in $$list; do echo "$$p $$p"; done | \ |
|
564 sed 's/$(EXEEXT)$$//' | \ |
|
565 while read p p1; do if test -f $$p || test -f $$p1; \ |
|
566 @@ -420,20 +420,20 @@ |
|
567 while read type dir files; do \ |
|
568 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
569 test -z "$$files" || { \ |
|
570 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
571 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
572 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
573 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
574 } \ |
|
575 ; done |
|
576 |
|
577 uninstall-binPROGRAMS: |
|
578 @$(NORMAL_UNINSTALL) |
|
579 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
580 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
581 files=`for p in $$list; do echo "$$p"; done | \ |
|
582 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
|
583 -e 's/$$/$(EXEEXT)/' `; \ |
|
584 test -n "$$list" || exit 0; \ |
|
585 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
586 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
587 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
588 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
589 |
|
590 clean-binPROGRAMS: |
|
591 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
592 @@ -628,7 +628,7 @@ |
|
593 install-binPROGRAMS: install-libLTLIBRARIES |
|
594 |
|
595 installdirs: |
|
596 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
597 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
598 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
599 done |
|
600 install: install-am |
|
601 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp |
|
602 --- /tmp/ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp Thu Oct 7 07:28:58 2010 |
|
603 +++ ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp Thu Feb 24 16:51:17 2011 |
|
604 @@ -23,6 +23,9 @@ |
|
605 #include INCLUDE_TCL |
|
606 #include <string.h> |
|
607 #include <stdlib.h> |
|
608 +#if defined(__SVR4) && defined(__sun) |
|
609 +#include <strings.h> |
|
610 +#endif |
|
611 #define SWIGTCL |
|
612 #define SWIGTCL8 |
|
613 /* |
|
614 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/ibdmsh_wrap.cpp ibutils-1.5.7/ibdm/ibdm/ibdmsh_wrap.cpp |
|
615 --- /tmp/ibutils-1.5.7/ibdm/ibdm/ibdmsh_wrap.cpp Thu Oct 7 07:28:58 2010 |
|
616 +++ ibutils-1.5.7/ibdm/ibdm/ibdmsh_wrap.cpp Thu Feb 24 16:51:17 2011 |
|
617 @@ -22,6 +22,9 @@ |
|
618 #define INCLUDE_TK <tk.h> |
|
619 #include INCLUDE_TCL |
|
620 #include <string.h> |
|
621 +#if defined(__SVR4) && defined(__sun) |
|
622 +#include <strings.h> |
|
623 +#endif |
|
624 #include <stdlib.h> |
|
625 #define SWIGTCL |
|
626 #define SWIGTCL8 |
|
627 diff -r -u /tmp/ibutils-1.5.7/ibdm/configure ibutils-1.5.7/ibdm/configure |
|
628 --- /tmp/ibutils-1.5.7/ibdm/configure Tue Mar 8 03:09:43 2011 |
|
629 +++ ibutils-1.5.7/ibdm/configure Thu Mar 10 18:33:25 2011 |
|
630 @@ -2764,7 +2764,7 @@ |
|
631 |
|
632 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
|
633 |
|
634 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
|
635 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744' |
|
636 |
|
637 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
|
638 $as_echo_n "checking whether build environment is sane... " >&6; } |
|
639 @@ -6633,7 +6633,7 @@ |
|
640 |
|
641 # Determine commands to create old-style static archives. |
|
642 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
|
643 -old_postinstall_cmds='chmod 644 $oldlib' |
|
644 +old_postinstall_cmds='chmod 744 $oldlib' |
|
645 old_postuninstall_cmds= |
|
646 |
|
647 if test -n "$RANLIB"; then |
|
648 @@ -10321,6 +10321,7 @@ |
|
649 ;; |
|
650 esac |
|
651 link_all_deplibs=yes |
|
652 + hardcode_libdir_flag_spec= |
|
653 ;; |
|
654 |
|
655 sunos4*) |
|
656 @@ -11248,6 +11249,24 @@ |
|
657 hardcode_into_libs=yes |
|
658 # ldd complains unless libraries are executable |
|
659 postinstall_cmds='chmod +x $lib' |
|
660 + |
|
661 + if echo "$CFLAGS" | grep '\-m64' >/dev/null ; then |
|
662 + sys_lib_search_path_spec=`$CC -m64 -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
|
663 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
|
664 + |
|
665 + solaris_arch=`uname -p` |
|
666 + if [ $solaris_arch = "i386" ]; then |
|
667 + lib64=amd64 |
|
668 + else |
|
669 + lib64=sparcv9 |
|
670 + fi |
|
671 + |
|
672 + if ! echo "$sys_lib_search_path_spec" | grep $lib64 >/dev/null ; then |
|
673 + solaris_lib64path=`echo "$sys_lib_search_path_spec" | $SED -e "s/ /$lib64\/ /g" | cut -d " " -f2-` |
|
674 + solaris_lib64path="$solaris_lib64path""$lib64"/ |
|
675 + sys_lib_search_path_spec="$solaris_lib64path $sys_lib_search_path_spec" |
|
676 + fi |
|
677 + fi |
|
678 ;; |
|
679 |
|
680 sunos4*) |
|
681 @@ -13191,6 +13210,7 @@ |
|
682 fi |
|
683 ;; |
|
684 esac |
|
685 + hardcode_libdir_flag_spec_CXX= |
|
686 ;; |
|
687 |
|
688 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
|
689 @@ -14716,6 +14736,24 @@ |
|
690 hardcode_into_libs=yes |
|
691 # ldd complains unless libraries are executable |
|
692 postinstall_cmds='chmod +x $lib' |
|
693 + |
|
694 + if echo "$CFLAGS" | grep '\-m64' >/dev/null ; then |
|
695 + sys_lib_search_path_spec=`$CC -m64 -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` |
|
696 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` |
|
697 + |
|
698 + solaris_arch=`uname -p` |
|
699 + if [ $solaris_arch = "i386" ]; then |
|
700 + lib64=amd64 |
|
701 + else |
|
702 + lib64=sparcv9 |
|
703 + fi |
|
704 + |
|
705 + if ! echo "$sys_lib_search_path_spec" | grep $lib64 >/dev/null ; then |
|
706 + solaris_lib64path=`echo "$sys_lib_search_path_spec" | $SED -e "s/ /$lib64\/ /g" | cut -d " " -f2-` |
|
707 + solaris_lib64path="$solaris_lib64path""$lib64"/ |
|
708 + sys_lib_search_path_spec="$solaris_lib64path $sys_lib_search_path_spec" |
|
709 + fi |
|
710 + fi |
|
711 ;; |
|
712 |
|
713 sunos4*) |
|
714 diff -r -u /tmp/ibutils-1.5.7/ibis/aclocal.m4 ibutils-1.5.7/ibis/aclocal.m4 |
|
715 --- /tmp/ibutils-1.5.7/ibis/aclocal.m4 Tue Mar 8 03:09:48 2011 |
|
716 +++ ibutils-1.5.7/ibis/aclocal.m4 Thu Feb 24 16:51:17 2011 |
|
717 @@ -1389,7 +1389,7 @@ |
|
718 |
|
719 # Determine commands to create old-style static archives. |
|
720 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
|
721 -old_postinstall_cmds='chmod 644 $oldlib' |
|
722 +old_postinstall_cmds='chmod 744 $oldlib' |
|
723 old_postuninstall_cmds= |
|
724 |
|
725 if test -n "$RANLIB"; then |
|
726 diff -r -u /tmp/ibutils-1.5.7/ibis/doc/Makefile.in ibutils-1.5.7/ibis/doc/Makefile.in |
|
727 --- /tmp/ibutils-1.5.7/ibis/doc/Makefile.in Tue Mar 8 03:09:51 2011 |
|
728 +++ ibutils-1.5.7/ibis/doc/Makefile.in Thu Feb 24 16:51:18 2011 |
|
729 @@ -52,7 +52,7 @@ |
|
730 pkglibdir = $(libdir)/@PACKAGE@ |
|
731 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
732 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
733 -install_sh_DATA = $(install_sh) -c -m 644 |
|
734 +install_sh_DATA = $(install_sh) -c -m 744 |
|
735 install_sh_PROGRAM = $(install_sh) -c |
|
736 install_sh_SCRIPT = $(install_sh) -c |
|
737 INSTALL_HEADER = $(INSTALL_DATA) |
|
738 diff -r -u /tmp/ibutils-1.5.7/ibis/src/Makefile.in ibutils-1.5.7/ibis/src/Makefile.in |
|
739 --- /tmp/ibutils-1.5.7/ibis/src/Makefile.in Tue Mar 8 03:09:51 2011 |
|
740 +++ ibutils-1.5.7/ibis/src/Makefile.in Thu Feb 24 16:51:18 2011 |
|
741 @@ -55,7 +55,7 @@ |
|
742 pkglibdir = $(libdir)/@PACKAGE@ |
|
743 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
744 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
745 -install_sh_DATA = $(install_sh) -c -m 644 |
|
746 +install_sh_DATA = $(install_sh) -c -m 744 |
|
747 install_sh_PROGRAM = $(install_sh) -c |
|
748 install_sh_SCRIPT = $(install_sh) -c |
|
749 INSTALL_HEADER = $(INSTALL_DATA) |
|
750 @@ -113,7 +113,7 @@ |
|
751 am__base_list = \ |
|
752 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
753 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
754 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" |
|
755 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" |
|
756 LTLIBRARIES = $(lib_LTLIBRARIES) |
|
757 libibis_la_LIBADD = |
|
758 am_libibis_la_OBJECTS = ibis_wrap.lo ibbbm.lo ibcr.lo ibis.lo \ |
|
759 @@ -420,8 +420,8 @@ |
|
760 $(libibis_la_LINK) -rpath $(libdir) $(libibis_la_OBJECTS) $(libibis_la_LIBADD) $(LIBS) |
|
761 install-binPROGRAMS: $(bin_PROGRAMS) |
|
762 @$(NORMAL_INSTALL) |
|
763 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
764 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
765 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
766 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
767 for p in $$list; do echo "$$p $$p"; done | \ |
|
768 sed 's/$(EXEEXT)$$//' | \ |
|
769 while read p p1; do if test -f $$p || test -f $$p1; \ |
|
770 @@ -438,20 +438,20 @@ |
|
771 while read type dir files; do \ |
|
772 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
773 test -z "$$files" || { \ |
|
774 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
775 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
776 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
777 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
778 } \ |
|
779 ; done |
|
780 |
|
781 uninstall-binPROGRAMS: |
|
782 @$(NORMAL_UNINSTALL) |
|
783 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
784 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
785 files=`for p in $$list; do echo "$$p"; done | \ |
|
786 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
|
787 -e 's/$$/$(EXEEXT)/' `; \ |
|
788 test -n "$$list" || exit 0; \ |
|
789 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
790 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
791 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
792 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
793 |
|
794 clean-binPROGRAMS: |
|
795 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
796 @@ -754,7 +754,7 @@ |
|
797 install-binPROGRAMS: install-libLTLIBRARIES |
|
798 |
|
799 installdirs: |
|
800 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \ |
|
801 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"; do \ |
|
802 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
803 done |
|
804 install: install-am |
|
805 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibbbm_base.h ibutils-1.5.7/ibis/src/ibbbm_base.h |
|
806 --- /tmp/ibutils-1.5.7/ibis/src/ibbbm_base.h Wed Feb 24 02:09:25 2010 |
|
807 +++ ibutils-1.5.7/ibis/src/ibbbm_base.h Thu Feb 24 16:51:18 2011 |
|
808 @@ -30,11 +30,14 @@ |
|
809 * SOFTWARE. |
|
810 * |
|
811 */ |
|
812 - |
|
813 #ifndef _IBBBM_BASE_H_ |
|
814 #define _IBBBM_BASE_H_ |
|
815 |
|
816 +#if !(defined(__SVR4) && defined(__sun)) |
|
817 #include <endian.h> |
|
818 +#else |
|
819 +#include <infiniband/ofa_solaris.h> |
|
820 +#endif |
|
821 |
|
822 #define BBM_CLASS 0x05 |
|
823 #define BBM_ATTR_BKEYINFO 0x10 |
|
824 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibcr_base.h ibutils-1.5.7/ibis/src/ibcr_base.h |
|
825 --- /tmp/ibutils-1.5.7/ibis/src/ibcr_base.h Wed Feb 24 02:09:25 2010 |
|
826 +++ ibutils-1.5.7/ibis/src/ibcr_base.h Thu Feb 24 16:51:18 2011 |
|
827 @@ -34,7 +34,11 @@ |
|
828 #ifndef _IBCR_BASE_H_ |
|
829 #define _IBCR_BASE_H_ |
|
830 |
|
831 +#if !(defined(__SVR4) && defined(__sun)) |
|
832 #include <endian.h> |
|
833 +#else |
|
834 +#include <infiniband/ofa_solaris.h> |
|
835 +#endif |
|
836 |
|
837 #define CR_CLASS 0x09 |
|
838 #define CR_ATTR_50 0x50 |
|
839 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c ibutils-1.5.7/ibis/src/ibis_wrap.c |
|
840 --- /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Nov 1 16:03:44 2010 |
|
841 +++ ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Jun 6 15:35:52 2011 |
|
842 @@ -2722,18 +2722,18 @@ |
|
843 typedef ib_mad_notice_attr_t smNotice; |
|
844 |
|
845 /* these are the globals to be used for set/get */ |
|
846 - ib_node_info_t ibsm_node_info_obj; |
|
847 - ib_port_info_t ibsm_port_info_obj; |
|
848 - ib_switch_info_t ibsm_switch_info_obj; |
|
849 - ibsm_lft_block_t ibsm_lft_block_obj; |
|
850 - ibsm_mft_block_t ibsm_mft_block_obj; |
|
851 - ib_guid_info_t ibsm_guid_info_obj; |
|
852 - ib_pkey_table_t ibsm_pkey_table_obj; |
|
853 - ib_slvl_table_t ibsm_slvl_table_obj; |
|
854 - ib_vl_arb_table_t ibsm_vl_arb_table_obj; |
|
855 - ib_node_desc_t ibsm_node_desc_obj; |
|
856 - ib_sm_info_t ibsm_sm_info_obj; |
|
857 - ib_mad_notice_attr_t ibsm_notice_obj; |
|
858 + ib_node_info_t ibsm_node_info_obj __attribute__((aligned)); |
|
859 + ib_port_info_t ibsm_port_info_obj __attribute__((aligned)); |
|
860 + ib_switch_info_t ibsm_switch_info_obj __attribute__((aligned)); |
|
861 + ibsm_lft_block_t ibsm_lft_block_obj __attribute__((aligned)); |
|
862 + ibsm_mft_block_t ibsm_mft_block_obj __attribute__((aligned)); |
|
863 + ib_guid_info_t ibsm_guid_info_obj __attribute__((aligned)); |
|
864 + ib_pkey_table_t ibsm_pkey_table_obj __attribute__((aligned)); |
|
865 + ib_slvl_table_t ibsm_slvl_table_obj __attribute__((aligned)); |
|
866 + ib_vl_arb_table_t ibsm_vl_arb_table_obj __attribute__((aligned)); |
|
867 + ib_node_desc_t ibsm_node_desc_obj __attribute__((aligned)); |
|
868 + ib_sm_info_t ibsm_sm_info_obj __attribute__((aligned)); |
|
869 + ib_mad_notice_attr_t ibsm_notice_obj __attribute__((aligned)); |
|
870 |
|
871 /* TODO - define a Vendor Specific CR Read/Write attributes to use VL15 */ |
|
872 |
|
873 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibpm_base.h ibutils-1.5.7/ibis/src/ibpm_base.h |
|
874 --- /tmp/ibutils-1.5.7/ibis/src/ibpm_base.h Wed Feb 24 02:09:25 2010 |
|
875 +++ ibutils-1.5.7/ibis/src/ibpm_base.h Thu Feb 24 16:51:18 2011 |
|
876 @@ -34,7 +34,11 @@ |
|
877 #ifndef _IBPM_BASE_H_ |
|
878 #define _IBPM_BASE_H_ |
|
879 |
|
880 +#if !(defined(__SVR4) && defined(__sun)) |
|
881 #include <endian.h> |
|
882 +#else |
|
883 +#include <infiniband/ofa_solaris.h> |
|
884 +#endif |
|
885 |
|
886 #define PERF_CLASS 0x04 |
|
887 #define PERF_CLASS_PORT_INFO 0x01 |
|
888 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibvs_base.h ibutils-1.5.7/ibis/src/ibvs_base.h |
|
889 --- /tmp/ibutils-1.5.7/ibis/src/ibvs_base.h Wed Feb 24 02:09:25 2010 |
|
890 +++ ibutils-1.5.7/ibis/src/ibvs_base.h Thu Feb 24 16:51:18 2011 |
|
891 @@ -34,7 +34,11 @@ |
|
892 #ifndef _IBVS_BASE_H_ |
|
893 #define _IBVS_BASE_H_ |
|
894 |
|
895 +#if !(defined(__SVR4) && defined(__sun)) |
|
896 #include <endian.h> |
|
897 +#else |
|
898 +#include <infiniband/ofa_solaris.h> |
|
899 +#endif |
|
900 |
|
901 #define VS_CLASS 0x0a |
|
902 #define VS_CLASS_PORT_INFO 0x01 |
|
903 diff -r -u /tmp/ibutils-1.5.7/ibis/src/swig_extended_obj.c ibutils-1.5.7/ibis/src/swig_extended_obj.c |
|
904 --- /tmp/ibutils-1.5.7/ibis/src/swig_extended_obj.c Tue Mar 23 02:21:00 2010 |
|
905 +++ ibutils-1.5.7/ibis/src/swig_extended_obj.c Thu Feb 24 16:51:18 2011 |
|
906 @@ -30,6 +30,9 @@ |
|
907 * SOFTWARE. |
|
908 * |
|
909 */ |
|
910 +#if defined(__SVR4) && defined(__sun) |
|
911 +#include <strings.h> |
|
912 +#endif |
|
913 |
|
914 /*-------------------------------------------------------------------- |
|
915 * This file holds an extended implementation for SWIG TCL Objects. |
|
916 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibissh_wrap.cpp ibutils-1.5.7/ibis/src/ibissh_wrap.cpp |
|
917 --- /tmp/ibutils-1.5.7/ibis/src/ibissh_wrap.cpp Mon Nov 1 16:03:44 2010 |
|
918 +++ ibutils-1.5.7/ibis/src/ibissh_wrap.cpp Thu Feb 24 16:51:18 2011 |
|
919 @@ -13,6 +13,11 @@ |
|
920 * Do not make changes to this file--changes will be lost! |
|
921 * |
|
922 */ |
|
923 +#if defined(__SVR4) && defined(__sun) |
|
924 +#include <sys/types.h> |
|
925 +#define TRUE _B_TRUE |
|
926 +#define FALSE _B_FALSE |
|
927 +#endif |
|
928 |
|
929 |
|
930 #define SWIGCODE |
|
931 @@ -823,7 +828,11 @@ |
|
932 // Write response - no data |
|
933 // Note: The trailing space here is important ! |
|
934 sprintf(buff, "ACK "); |
|
935 +#if defined(__SVR4) && defined(__sun) |
|
936 + space_in_resp = (boolean_t)0; |
|
937 +#else |
|
938 space_in_resp = 0; |
|
939 +#endif |
|
940 } |
|
941 |
|
942 if (is_multi && space_in_resp) |
|
943 @@ -2722,18 +2731,18 @@ |
|
944 typedef ib_mad_notice_attr_t smNotice; |
|
945 |
|
946 /* these are the globals to be used for set/get */ |
|
947 - ib_node_info_t ibsm_node_info_obj; |
|
948 - ib_port_info_t ibsm_port_info_obj; |
|
949 - ib_switch_info_t ibsm_switch_info_obj; |
|
950 - ibsm_lft_block_t ibsm_lft_block_obj; |
|
951 - ibsm_mft_block_t ibsm_mft_block_obj; |
|
952 - ib_guid_info_t ibsm_guid_info_obj; |
|
953 - ib_pkey_table_t ibsm_pkey_table_obj; |
|
954 - ib_slvl_table_t ibsm_slvl_table_obj; |
|
955 - ib_vl_arb_table_t ibsm_vl_arb_table_obj; |
|
956 - ib_node_desc_t ibsm_node_desc_obj; |
|
957 - ib_sm_info_t ibsm_sm_info_obj; |
|
958 - ib_mad_notice_attr_t ibsm_notice_obj; |
|
959 + ib_node_info_t ibsm_node_info_obj __attribute__((aligned)); |
|
960 + ib_port_info_t ibsm_port_info_obj __attribute__((aligned)); |
|
961 + ib_switch_info_t ibsm_switch_info_obj __attribute__((aligned)); |
|
962 + ibsm_lft_block_t ibsm_lft_block_obj __attribute__((aligned)); |
|
963 + ibsm_mft_block_t ibsm_mft_block_obj __attribute__((aligned)); |
|
964 + ib_guid_info_t ibsm_guid_info_obj __attribute__((aligned)); |
|
965 + ib_pkey_table_t ibsm_pkey_table_obj __attribute__((aligned)); |
|
966 + ib_slvl_table_t ibsm_slvl_table_obj __attribute__((aligned)); |
|
967 + ib_vl_arb_table_t ibsm_vl_arb_table_obj __attribute__((aligned)); |
|
968 + ib_node_desc_t ibsm_node_desc_obj __attribute__((aligned)); |
|
969 + ib_sm_info_t ibsm_sm_info_obj __attribute__((aligned)); |
|
970 + ib_mad_notice_attr_t ibsm_notice_obj __attribute__((aligned)); |
|
971 |
|
972 /* TODO - define a Vendor Specific CR Read/Write attributes to use VL15 */ |
|
973 |
|
974 diff -r -u /tmp/ibutils-1.5.7/ibis/tests/Makefile.in ibutils-1.5.7/ibis/tests/Makefile.in |
|
975 --- /tmp/ibutils-1.5.7/ibis/tests/Makefile.in Tue Mar 8 03:09:51 2011 |
|
976 +++ ibutils-1.5.7/ibis/tests/Makefile.in Thu Feb 24 16:51:18 2011 |
|
977 @@ -53,7 +53,7 @@ |
|
978 pkglibdir = $(libdir)/@PACKAGE@ |
|
979 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
980 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
981 -install_sh_DATA = $(install_sh) -c -m 644 |
|
982 +install_sh_DATA = $(install_sh) -c -m 744 |
|
983 install_sh_PROGRAM = $(install_sh) -c |
|
984 install_sh_SCRIPT = $(install_sh) -c |
|
985 INSTALL_HEADER = $(INSTALL_DATA) |
|
986 diff -r -u /tmp/ibutils-1.5.7/ibis/Makefile.in ibutils-1.5.7/ibis/Makefile.in |
|
987 --- /tmp/ibutils-1.5.7/ibis/Makefile.in Tue Mar 8 03:09:51 2011 |
|
988 +++ ibutils-1.5.7/ibis/Makefile.in Thu Feb 24 16:51:17 2011 |
|
989 @@ -54,7 +54,7 @@ |
|
990 pkglibdir = $(libdir)/@PACKAGE@ |
|
991 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
992 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
993 -install_sh_DATA = $(install_sh) -c -m 644 |
|
994 +install_sh_DATA = $(install_sh) -c -m 744 |
|
995 install_sh_PROGRAM = $(install_sh) -c |
|
996 install_sh_SCRIPT = $(install_sh) -c |
|
997 INSTALL_HEADER = $(INSTALL_DATA) |
|
998 diff -r -u /tmp/ibutils-1.5.7/ibis/configure ibutils-1.5.7/ibis/configure |
|
999 --- /tmp/ibutils-1.5.7/ibis/configure Tue Mar 8 03:09:53 2011 |
|
1000 +++ ibutils-1.5.7/ibis/configure Thu Mar 10 18:33:26 2011 |
|
1001 @@ -2764,7 +2764,7 @@ |
|
1002 |
|
1003 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
|
1004 |
|
1005 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
|
1006 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744' |
|
1007 |
|
1008 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
|
1009 $as_echo_n "checking whether build environment is sane... " >&6; } |
|
1010 @@ -6398,7 +6398,7 @@ |
|
1011 |
|
1012 # Determine commands to create old-style static archives. |
|
1013 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
|
1014 -old_postinstall_cmds='chmod 644 $oldlib' |
|
1015 +old_postinstall_cmds='chmod 744 $oldlib' |
|
1016 old_postuninstall_cmds= |
|
1017 |
|
1018 if test -n "$RANLIB"; then |
|
1019 @@ -10087,6 +10087,7 @@ |
|
1020 ;; |
|
1021 esac |
|
1022 link_all_deplibs=yes |
|
1023 + hardcode_libdir_flag_spec= |
|
1024 ;; |
|
1025 |
|
1026 sunos4*) |
|
1027 @@ -12957,6 +12958,7 @@ |
|
1028 fi |
|
1029 ;; |
|
1030 esac |
|
1031 + hardcode_libdir_flag_spec_CXX= |
|
1032 ;; |
|
1033 |
|
1034 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
|
1035 @@ -15295,7 +15297,8 @@ |
|
1036 { $as_echo "$as_me:${as_lineno-$LINENO}: OSM: build type $OSM_BUILD" >&5 |
|
1037 $as_echo "$as_me: OSM: build type $OSM_BUILD" >&6;} |
|
1038 |
|
1039 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs" |
|
1040 + with_osm_libs=`echo "$with_osm_libs" | $SED -e "s/64//g"` |
|
1041 + OSM_LDFLAGS="-L$with_osm_libs" |
|
1042 if test $OSM_BUILD = openib; then |
|
1043 osm_include_dir="$with_osm/include/infiniband" |
|
1044 osm_extra_includes="-I$with_osm/include" |
|
1045 @@ -15378,7 +15381,7 @@ |
|
1046 osm_debug_flags= |
|
1047 fi |
|
1048 |
|
1049 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" |
|
1050 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1" |
|
1051 else |
|
1052 with_osm=disabled |
|
1053 OSM_CLFAGS=disabled |
|
1054 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/aclocal.m4 ibutils-1.5.7/ibmgtsim/aclocal.m4 |
|
1055 --- /tmp/ibutils-1.5.7/ibmgtsim/aclocal.m4 Tue Mar 8 03:09:58 2011 |
|
1056 +++ ibutils-1.5.7/ibmgtsim/aclocal.m4 Thu Feb 24 16:51:18 2011 |
|
1057 @@ -1389,7 +1389,7 @@ |
|
1058 |
|
1059 # Determine commands to create old-style static archives. |
|
1060 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
|
1061 -old_postinstall_cmds='chmod 644 $oldlib' |
|
1062 +old_postinstall_cmds='chmod 744 $oldlib' |
|
1063 old_postuninstall_cmds= |
|
1064 |
|
1065 if test -n "$RANLIB"; then |
|
1066 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/doc/Makefile.in ibutils-1.5.7/ibmgtsim/doc/Makefile.in |
|
1067 --- /tmp/ibutils-1.5.7/ibmgtsim/doc/Makefile.in Tue Mar 8 03:10:01 2011 |
|
1068 +++ ibutils-1.5.7/ibmgtsim/doc/Makefile.in Thu Feb 24 16:51:18 2011 |
|
1069 @@ -52,7 +52,7 @@ |
|
1070 pkglibdir = $(libdir)/@PACKAGE@ |
|
1071 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
1072 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
1073 -install_sh_DATA = $(install_sh) -c -m 644 |
|
1074 +install_sh_DATA = $(install_sh) -c -m 744 |
|
1075 install_sh_PROGRAM = $(install_sh) -c |
|
1076 install_sh_SCRIPT = $(install_sh) -c |
|
1077 INSTALL_HEADER = $(INSTALL_DATA) |
|
1078 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/src/Makefile.in ibutils-1.5.7/ibmgtsim/src/Makefile.in |
|
1079 --- /tmp/ibutils-1.5.7/ibmgtsim/src/Makefile.in Tue Mar 8 03:10:01 2011 |
|
1080 +++ ibutils-1.5.7/ibmgtsim/src/Makefile.in Thu Feb 24 16:51:18 2011 |
|
1081 @@ -55,7 +55,7 @@ |
|
1082 pkglibdir = $(libdir)/@PACKAGE@ |
|
1083 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
1084 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
1085 -install_sh_DATA = $(install_sh) -c -m 644 |
|
1086 +install_sh_DATA = $(install_sh) -c -m 744 |
|
1087 install_sh_PROGRAM = $(install_sh) -c |
|
1088 install_sh_SCRIPT = $(install_sh) -c |
|
1089 INSTALL_HEADER = $(INSTALL_DATA) |
|
1090 @@ -103,7 +103,7 @@ |
|
1091 am__base_list = \ |
|
1092 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
1093 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
1094 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ |
|
1095 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \ |
|
1096 "$(DESTDIR)$(pkgincludedir)" |
|
1097 LTLIBRARIES = $(lib_LTLIBRARIES) |
|
1098 libibmscli_la_LIBADD = |
|
1099 @@ -430,8 +430,8 @@ |
|
1100 $(libibmscli_la_LINK) -rpath $(libdir) $(libibmscli_la_OBJECTS) $(libibmscli_la_LIBADD) $(LIBS) |
|
1101 install-binPROGRAMS: $(bin_PROGRAMS) |
|
1102 @$(NORMAL_INSTALL) |
|
1103 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
1104 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
1105 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
1106 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
1107 for p in $$list; do echo "$$p $$p"; done | \ |
|
1108 sed 's/$(EXEEXT)$$//' | \ |
|
1109 while read p p1; do if test -f $$p || test -f $$p1; \ |
|
1110 @@ -455,13 +455,13 @@ |
|
1111 |
|
1112 uninstall-binPROGRAMS: |
|
1113 @$(NORMAL_UNINSTALL) |
|
1114 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
|
1115 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \ |
|
1116 files=`for p in $$list; do echo "$$p"; done | \ |
|
1117 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
|
1118 -e 's/$$/$(EXEEXT)/' `; \ |
|
1119 test -n "$$list" || exit 0; \ |
|
1120 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
1121 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
1122 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
1123 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
1124 |
|
1125 clean-binPROGRAMS: |
|
1126 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ |
|
1127 @@ -693,7 +693,7 @@ |
|
1128 install-binPROGRAMS: install-libLTLIBRARIES |
|
1129 |
|
1130 installdirs: |
|
1131 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
1132 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgincludedir)"; do \ |
|
1133 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
1134 done |
|
1135 install: install-am |
|
1136 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/tests/Makefile.in ibutils-1.5.7/ibmgtsim/tests/Makefile.in |
|
1137 --- /tmp/ibutils-1.5.7/ibmgtsim/tests/Makefile.in Tue Mar 8 03:10:01 2011 |
|
1138 +++ ibutils-1.5.7/ibmgtsim/tests/Makefile.in Thu Feb 24 16:51:19 2011 |
|
1139 @@ -53,7 +53,7 @@ |
|
1140 pkglibdir = $(libdir)/@PACKAGE@ |
|
1141 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
1142 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
1143 -install_sh_DATA = $(install_sh) -c -m 644 |
|
1144 +install_sh_DATA = $(install_sh) -c -m 744 |
|
1145 install_sh_PROGRAM = $(install_sh) -c |
|
1146 install_sh_SCRIPT = $(install_sh) -c |
|
1147 INSTALL_HEADER = $(INSTALL_DATA) |
|
1148 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/utils/Makefile.in ibutils-1.5.7/ibmgtsim/utils/Makefile.in |
|
1149 --- /tmp/ibutils-1.5.7/ibmgtsim/utils/Makefile.in Tue Mar 8 03:10:02 2011 |
|
1150 +++ ibutils-1.5.7/ibmgtsim/utils/Makefile.in Thu Feb 24 16:51:19 2011 |
|
1151 @@ -53,7 +53,7 @@ |
|
1152 pkglibdir = $(libdir)/@PACKAGE@ |
|
1153 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
1154 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
1155 -install_sh_DATA = $(install_sh) -c -m 644 |
|
1156 +install_sh_DATA = $(install_sh) -c -m 744 |
|
1157 install_sh_PROGRAM = $(install_sh) -c |
|
1158 install_sh_SCRIPT = $(install_sh) -c |
|
1159 INSTALL_HEADER = $(INSTALL_DATA) |
|
1160 @@ -99,7 +99,7 @@ |
|
1161 am__base_list = \ |
|
1162 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
|
1163 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
|
1164 -am__installdirs = "$(DESTDIR)$(bindir)" |
|
1165 +am__installdirs = "$(DESTDIR)$(sbindir)" |
|
1166 SCRIPTS = $(bin_SCRIPTS) |
|
1167 SOURCES = |
|
1168 DIST_SOURCES = |
|
1169 @@ -275,8 +275,8 @@ |
|
1170 $(am__aclocal_m4_deps): |
|
1171 install-binSCRIPTS: $(bin_SCRIPTS) |
|
1172 @$(NORMAL_INSTALL) |
|
1173 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" |
|
1174 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ |
|
1175 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" |
|
1176 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || list=; \ |
|
1177 for p in $$list; do \ |
|
1178 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
|
1179 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
|
1180 @@ -294,19 +294,19 @@ |
|
1181 while read type dir files; do \ |
|
1182 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
|
1183 test -z "$$files" || { \ |
|
1184 - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ |
|
1185 - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ |
|
1186 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \ |
|
1187 + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \ |
|
1188 } \ |
|
1189 ; done |
|
1190 |
|
1191 uninstall-binSCRIPTS: |
|
1192 @$(NORMAL_UNINSTALL) |
|
1193 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ |
|
1194 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \ |
|
1195 files=`for p in $$list; do echo "$$p"; done | \ |
|
1196 sed -e 's,.*/,,;$(transform)'`; \ |
|
1197 test -n "$$list" || exit 0; \ |
|
1198 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
|
1199 - cd "$(DESTDIR)$(bindir)" && rm -f $$files |
|
1200 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \ |
|
1201 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files |
|
1202 |
|
1203 mostlyclean-libtool: |
|
1204 -rm -f *.lo |
|
1205 @@ -354,7 +354,7 @@ |
|
1206 check: check-am |
|
1207 all-am: Makefile $(SCRIPTS) |
|
1208 installdirs: |
|
1209 - for dir in "$(DESTDIR)$(bindir)"; do \ |
|
1210 + for dir in "$(DESTDIR)$(sbindir)"; do \ |
|
1211 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
|
1212 done |
|
1213 install: install-am |
|
1214 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/Makefile.in ibutils-1.5.7/ibmgtsim/Makefile.in |
|
1215 --- /tmp/ibutils-1.5.7/ibmgtsim/Makefile.in Tue Mar 8 03:10:02 2011 |
|
1216 +++ ibutils-1.5.7/ibmgtsim/Makefile.in Thu Feb 24 16:51:18 2011 |
|
1217 @@ -54,7 +54,7 @@ |
|
1218 pkglibdir = $(libdir)/@PACKAGE@ |
|
1219 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
1220 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
1221 -install_sh_DATA = $(install_sh) -c -m 644 |
|
1222 +install_sh_DATA = $(install_sh) -c -m 744 |
|
1223 install_sh_PROGRAM = $(install_sh) -c |
|
1224 install_sh_SCRIPT = $(install_sh) -c |
|
1225 INSTALL_HEADER = $(INSTALL_DATA) |
|
1226 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/configure ibutils-1.5.7/ibmgtsim/configure |
|
1227 --- /tmp/ibutils-1.5.7/ibmgtsim/configure Tue Mar 8 03:10:03 2011 |
|
1228 +++ ibutils-1.5.7/ibmgtsim/configure Thu Mar 10 18:33:27 2011 |
|
1229 @@ -2769,7 +2769,7 @@ |
|
1230 |
|
1231 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
|
1232 |
|
1233 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
|
1234 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744' |
|
1235 |
|
1236 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
|
1237 $as_echo_n "checking whether build environment is sane... " >&6; } |
|
1238 @@ -6440,7 +6440,7 @@ |
|
1239 |
|
1240 # Determine commands to create old-style static archives. |
|
1241 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' |
|
1242 -old_postinstall_cmds='chmod 644 $oldlib' |
|
1243 +old_postinstall_cmds='chmod 744 $oldlib' |
|
1244 old_postuninstall_cmds= |
|
1245 |
|
1246 if test -n "$RANLIB"; then |
|
1247 @@ -15360,7 +15360,7 @@ |
|
1248 osm_debug_flags= |
|
1249 fi |
|
1250 |
|
1251 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" |
|
1252 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1" |
|
1253 else |
|
1254 with_osm=disabled |
|
1255 OSM_CLFAGS=disabled |
|
1256 diff -r -u /tmp/ibutils-1.5.7/Makefile.in ibutils-1.5.7/Makefile.in |
|
1257 --- /tmp/ibutils-1.5.7/Makefile.in Tue Mar 8 03:09:29 2011 |
|
1258 +++ ibutils-1.5.7/Makefile.in Thu Mar 10 18:33:24 2011 |
|
1259 @@ -54,7 +54,7 @@ |
|
1260 pkglibdir = $(libdir)/@PACKAGE@ |
|
1261 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
|
1262 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
|
1263 -install_sh_DATA = $(install_sh) -c -m 644 |
|
1264 +install_sh_DATA = $(install_sh) -c -m 744 |
|
1265 install_sh_PROGRAM = $(install_sh) -c |
|
1266 install_sh_SCRIPT = $(install_sh) -c |
|
1267 INSTALL_HEADER = $(INSTALL_DATA) |
|
1268 diff -r -u /tmp/ibutils-1.5.7/configure ibutils-1.5.7/configure |
|
1269 --- /tmp/ibutils-1.5.7/configure Tue Mar 8 03:09:29 2011 |
|
1270 +++ ibutils-1.5.7/configure Thu Mar 10 18:33:24 2011 |
|
1271 @@ -1824,7 +1824,7 @@ |
|
1272 |
|
1273 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
|
1274 |
|
1275 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
|
1276 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744' |
|
1277 |
|
1278 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 |
|
1279 $as_echo_n "checking whether build environment is sane... " >&6; } |
|
1280 @@ -2450,7 +2450,7 @@ |
|
1281 osm_debug_flags= |
|
1282 fi |
|
1283 |
|
1284 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1" |
|
1285 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1" |
|
1286 else |
|
1287 with_osm=disabled |
|
1288 OSM_CLFAGS=disabled |