?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
xz: change to new library paths
[unleashed-userland.git] / components / open-fabrics / ibutils / patches / base.patch
blobe24ba771c5e227aeb468641aba71ad5c0345bd25
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.cpp ibutils-1.5.7/ibdm/ibdm/Fabric.cpp
493 --- /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.cpp Thu Oct 7 07:29:56 2010
494 +++ ibutils-1.5.7/ibdm/ibdm/Fabric.cpp Mon Sep 19 12:03:07 2011
495 @@ -1954,6 +1954,7 @@
496 }*/
497 }
498 f.close();
499 + f.clear();
500
501 // Make second pass and build the tables
502 f.open(fn.c_str(),ifstream::in);
503 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.h ibutils-1.5.7/ibdm/ibdm/Fabric.h
504 --- /tmp/ibutils-1.5.7/ibdm/ibdm/Fabric.h Thu Oct 7 07:29:56 2010
505 +++ ibutils-1.5.7/ibdm/ibdm/Fabric.h Thu Feb 24 16:51:17 2011
506 @@ -54,6 +54,7 @@
507 #include <iostream>
508 #include <sstream>
509 #include <string>
510 +#include <cstring>
511 #include <stdio.h>
512 #include <stdlib.h>
513 #include <string.h>
514 @@ -69,7 +70,7 @@
515
516 #if __WORDSIZE == 64
517 #define PRIx64 "lx"
518 -#else
519 +#elseif !defined(__SVR4) || !defined(__sun)
520 #define PRIx64 "llx"
521 #endif
522 using namespace std;
523 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/TopoMatch.cpp ibutils-1.5.7/ibdm/ibdm/TopoMatch.cpp
524 --- /tmp/ibutils-1.5.7/ibdm/ibdm/TopoMatch.cpp Mon Nov 1 16:03:44 2010
525 +++ ibutils-1.5.7/ibdm/ibdm/TopoMatch.cpp Thu Feb 24 16:51:17 2011
526 @@ -57,6 +57,9 @@
527 #include "Regexp.h"
528 #include <iomanip>
529 #include <sstream>
530 +#if defined(__SVR4) && defined(__sun)
531 +#include <strings.h>
532 +#endif
533
534
535 //////////////////////////////////////////////////////////////////////////////
536 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/Makefile.in ibutils-1.5.7/ibdm/ibdm/Makefile.in
537 --- /tmp/ibutils-1.5.7/ibdm/ibdm/Makefile.in Tue Mar 8 03:09:41 2011
538 +++ ibutils-1.5.7/ibdm/ibdm/Makefile.in Thu Feb 24 16:51:17 2011
539 @@ -55,7 +55,7 @@
540 pkglibdir = $(libdir)/@PACKAGE@
541 pkglibexecdir = $(libexecdir)/@PACKAGE@
542 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
543 -install_sh_DATA = $(install_sh) -c -m 644
544 +install_sh_DATA = $(install_sh) -c -m 744
545 install_sh_PROGRAM = $(install_sh) -c
546 install_sh_SCRIPT = $(install_sh) -c
547 INSTALL_HEADER = $(INSTALL_DATA)
548 @@ -102,7 +102,7 @@
549 am__base_list = \
550 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
551 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
552 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
553 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \
554 "$(DESTDIR)$(pkgincludedir)"
555 LTLIBRARIES = $(lib_LTLIBRARIES)
556 am__DEPENDENCIES_1 =
557 @@ -316,7 +316,7 @@
558 AM_CFLAGS = $(DBG) $(IBNL_PATH) $(TCL_CFLAGS)
559 lib_LTLIBRARIES = libibdmcom.la libibdm.la
560 libibdmcom_la_SOURCES = $(common_SOURCES)
561 -libibdmcom_la_LIBADD =
562 +libibdmcom_la_LIBADD = $(TCL_LIBS)
563 libibdmcom_la_LDFLAGS = -version-info $(LIB_VER_TRIPLET)
564 libibdm_la_SOURCES = ibdm_wrap.cpp ibdm.i $(common_SOURCES)
565 libibdm_la_LIBADD = $(TCL_LIBS)
566 @@ -402,8 +402,8 @@
567 $(libibdmcom_la_LINK) -rpath $(libdir) $(libibdmcom_la_OBJECTS) $(libibdmcom_la_LIBADD) $(LIBS)
568 install-binPROGRAMS: $(bin_PROGRAMS)
569 @$(NORMAL_INSTALL)
570 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
571 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
572 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
573 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
574 for p in $$list; do echo "$$p $$p"; done | \
575 sed 's/$(EXEEXT)$$//' | \
576 while read p p1; do if test -f $$p || test -f $$p1; \
577 @@ -420,20 +420,20 @@
578 while read type dir files; do \
579 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
580 test -z "$$files" || { \
581 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
582 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
583 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
584 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
585 } \
586 ; done
587
588 uninstall-binPROGRAMS:
589 @$(NORMAL_UNINSTALL)
590 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
591 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
592 files=`for p in $$list; do echo "$$p"; done | \
593 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
594 -e 's/$$/$(EXEEXT)/' `; \
595 test -n "$$list" || exit 0; \
596 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
597 - cd "$(DESTDIR)$(bindir)" && rm -f $$files
598 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
599 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files
600
601 clean-binPROGRAMS:
602 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
603 @@ -628,7 +628,7 @@
604 install-binPROGRAMS: install-libLTLIBRARIES
605
606 installdirs:
607 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \
608 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgincludedir)"; do \
609 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
610 done
611 install: install-am
612 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp
613 --- /tmp/ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp Thu Oct 7 07:28:58 2010
614 +++ ibutils-1.5.7/ibdm/ibdm/ibdm_wrap.cpp Thu Feb 24 16:51:17 2011
615 @@ -23,6 +23,9 @@
616 #include INCLUDE_TCL
617 #include <string.h>
618 #include <stdlib.h>
619 +#if defined(__SVR4) && defined(__sun)
620 +#include <strings.h>
621 +#endif
622 #define SWIGTCL
623 #define SWIGTCL8
624 /*
625 diff -r -u /tmp/ibutils-1.5.7/ibdm/ibdm/ibdmsh_wrap.cpp ibutils-1.5.7/ibdm/ibdm/ibdmsh_wrap.cpp
626 --- /tmp/ibutils-1.5.7/ibdm/ibdm/ibdmsh_wrap.cpp Thu Oct 7 07:28:58 2010
627 +++ ibutils-1.5.7/ibdm/ibdm/ibdmsh_wrap.cpp Thu Feb 24 16:51:17 2011
628 @@ -22,6 +22,9 @@
629 #define INCLUDE_TK <tk.h>
630 #include INCLUDE_TCL
631 #include <string.h>
632 +#if defined(__SVR4) && defined(__sun)
633 +#include <strings.h>
634 +#endif
635 #include <stdlib.h>
636 #define SWIGTCL
637 #define SWIGTCL8
638 diff -r -u /tmp/ibutils-1.5.7/ibdm/configure ibutils-1.5.7/ibdm/configure
639 --- /tmp/ibutils-1.5.7/ibdm/configure Tue Mar 8 03:09:43 2011
640 +++ ibutils-1.5.7/ibdm/configure Thu Mar 10 18:33:25 2011
641 @@ -2764,7 +2764,7 @@
642
643 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
644
645 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
646 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744'
647
648 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
649 $as_echo_n "checking whether build environment is sane... " >&6; }
650 @@ -6633,7 +6633,7 @@
651
652 # Determine commands to create old-style static archives.
653 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
654 -old_postinstall_cmds='chmod 644 $oldlib'
655 +old_postinstall_cmds='chmod 744 $oldlib'
656 old_postuninstall_cmds=
657
658 if test -n "$RANLIB"; then
659 @@ -10321,6 +10321,7 @@
660 ;;
661 esac
662 link_all_deplibs=yes
663 + hardcode_libdir_flag_spec=
664 ;;
665
666 sunos4*)
667 @@ -11248,6 +11249,24 @@
668 hardcode_into_libs=yes
669 # ldd complains unless libraries are executable
670 postinstall_cmds='chmod +x $lib'
671 +
672 + if echo "$CFLAGS" | grep '\-m64' >/dev/null ; then
673 + sys_lib_search_path_spec=`$CC -m64 -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
674 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
675 +
676 + solaris_arch=`uname -p`
677 + if [ $solaris_arch = "i386" ]; then
678 + lib64=amd64
679 + else
680 + lib64=sparcv9
681 + fi
682 +
683 + if ! echo "$sys_lib_search_path_spec" | grep $lib64 >/dev/null ; then
684 + solaris_lib64path=`echo "$sys_lib_search_path_spec" | $SED -e "s/ /$lib64\/ /g" | cut -d " " -f2-`
685 + solaris_lib64path="$solaris_lib64path""$lib64"/
686 + sys_lib_search_path_spec="$solaris_lib64path $sys_lib_search_path_spec"
687 + fi
688 + fi
689 ;;
690
691 sunos4*)
692 @@ -13191,6 +13210,7 @@
693 fi
694 ;;
695 esac
696 + hardcode_libdir_flag_spec_CXX=
697 ;;
698
699 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
700 @@ -14716,6 +14736,24 @@
701 hardcode_into_libs=yes
702 # ldd complains unless libraries are executable
703 postinstall_cmds='chmod +x $lib'
704 +
705 + if echo "$CFLAGS" | grep '\-m64' >/dev/null ; then
706 + sys_lib_search_path_spec=`$CC -m64 -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
707 + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
708 +
709 + solaris_arch=`uname -p`
710 + if [ $solaris_arch = "i386" ]; then
711 + lib64=amd64
712 + else
713 + lib64=sparcv9
714 + fi
715 +
716 + if ! echo "$sys_lib_search_path_spec" | grep $lib64 >/dev/null ; then
717 + solaris_lib64path=`echo "$sys_lib_search_path_spec" | $SED -e "s/ /$lib64\/ /g" | cut -d " " -f2-`
718 + solaris_lib64path="$solaris_lib64path""$lib64"/
719 + sys_lib_search_path_spec="$solaris_lib64path $sys_lib_search_path_spec"
720 + fi
721 + fi
722 ;;
723
724 sunos4*)
725 diff -r -u /tmp/ibutils-1.5.7/ibis/aclocal.m4 ibutils-1.5.7/ibis/aclocal.m4
726 --- /tmp/ibutils-1.5.7/ibis/aclocal.m4 Tue Mar 8 03:09:48 2011
727 +++ ibutils-1.5.7/ibis/aclocal.m4 Thu Feb 24 16:51:17 2011
728 @@ -1389,7 +1389,7 @@
729
730 # Determine commands to create old-style static archives.
731 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
732 -old_postinstall_cmds='chmod 644 $oldlib'
733 +old_postinstall_cmds='chmod 744 $oldlib'
734 old_postuninstall_cmds=
735
736 if test -n "$RANLIB"; then
737 diff -r -u /tmp/ibutils-1.5.7/ibis/doc/Makefile.in ibutils-1.5.7/ibis/doc/Makefile.in
738 --- /tmp/ibutils-1.5.7/ibis/doc/Makefile.in Tue Mar 8 03:09:51 2011
739 +++ ibutils-1.5.7/ibis/doc/Makefile.in Thu Feb 24 16:51:18 2011
740 @@ -52,7 +52,7 @@
741 pkglibdir = $(libdir)/@PACKAGE@
742 pkglibexecdir = $(libexecdir)/@PACKAGE@
743 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
744 -install_sh_DATA = $(install_sh) -c -m 644
745 +install_sh_DATA = $(install_sh) -c -m 744
746 install_sh_PROGRAM = $(install_sh) -c
747 install_sh_SCRIPT = $(install_sh) -c
748 INSTALL_HEADER = $(INSTALL_DATA)
749 diff -r -u /tmp/ibutils-1.5.7/ibis/src/Makefile.in ibutils-1.5.7/ibis/src/Makefile.in
750 --- /tmp/ibutils-1.5.7/ibis/src/Makefile.in Tue Mar 8 03:09:51 2011
751 +++ ibutils-1.5.7/ibis/src/Makefile.in Thu Feb 24 16:51:18 2011
752 @@ -55,7 +55,7 @@
753 pkglibdir = $(libdir)/@PACKAGE@
754 pkglibexecdir = $(libexecdir)/@PACKAGE@
755 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
756 -install_sh_DATA = $(install_sh) -c -m 644
757 +install_sh_DATA = $(install_sh) -c -m 744
758 install_sh_PROGRAM = $(install_sh) -c
759 install_sh_SCRIPT = $(install_sh) -c
760 INSTALL_HEADER = $(INSTALL_DATA)
761 @@ -113,7 +113,7 @@
762 am__base_list = \
763 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
764 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
765 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
766 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"
767 LTLIBRARIES = $(lib_LTLIBRARIES)
768 libibis_la_LIBADD =
769 am_libibis_la_OBJECTS = ibis_wrap.lo ibbbm.lo ibcr.lo ibis.lo \
770 @@ -420,8 +420,8 @@
771 $(libibis_la_LINK) -rpath $(libdir) $(libibis_la_OBJECTS) $(libibis_la_LIBADD) $(LIBS)
772 install-binPROGRAMS: $(bin_PROGRAMS)
773 @$(NORMAL_INSTALL)
774 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
775 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
776 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
777 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
778 for p in $$list; do echo "$$p $$p"; done | \
779 sed 's/$(EXEEXT)$$//' | \
780 while read p p1; do if test -f $$p || test -f $$p1; \
781 @@ -438,20 +438,20 @@
782 while read type dir files; do \
783 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
784 test -z "$$files" || { \
785 - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
786 - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
787 + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
788 + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
789 } \
790 ; done
791
792 uninstall-binPROGRAMS:
793 @$(NORMAL_UNINSTALL)
794 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
795 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
796 files=`for p in $$list; do echo "$$p"; done | \
797 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
798 -e 's/$$/$(EXEEXT)/' `; \
799 test -n "$$list" || exit 0; \
800 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
801 - cd "$(DESTDIR)$(bindir)" && rm -f $$files
802 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
803 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files
804
805 clean-binPROGRAMS:
806 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
807 @@ -754,7 +754,7 @@
808 install-binPROGRAMS: install-libLTLIBRARIES
809
810 installdirs:
811 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
812 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)"; do \
813 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
814 done
815 install: install-am
816 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibbbm_base.h ibutils-1.5.7/ibis/src/ibbbm_base.h
817 --- /tmp/ibutils-1.5.7/ibis/src/ibbbm_base.h Wed Feb 24 02:09:25 2010
818 +++ ibutils-1.5.7/ibis/src/ibbbm_base.h Thu Feb 24 16:51:18 2011
819 @@ -30,11 +30,14 @@
820 * SOFTWARE.
821 *
822 */
823 -
824 #ifndef _IBBBM_BASE_H_
825 #define _IBBBM_BASE_H_
826
827 +#if !(defined(__SVR4) && defined(__sun))
828 #include <endian.h>
829 +#else
830 +#include <infiniband/ofa_solaris.h>
831 +#endif
832
833 #define BBM_CLASS 0x05
834 #define BBM_ATTR_BKEYINFO 0x10
835 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibcr_base.h ibutils-1.5.7/ibis/src/ibcr_base.h
836 --- /tmp/ibutils-1.5.7/ibis/src/ibcr_base.h Wed Feb 24 02:09:25 2010
837 +++ ibutils-1.5.7/ibis/src/ibcr_base.h Thu Feb 24 16:51:18 2011
838 @@ -34,7 +34,11 @@
839 #ifndef _IBCR_BASE_H_
840 #define _IBCR_BASE_H_
841
842 +#if !(defined(__SVR4) && defined(__sun))
843 #include <endian.h>
844 +#else
845 +#include <infiniband/ofa_solaris.h>
846 +#endif
847
848 #define CR_CLASS 0x09
849 #define CR_ATTR_50 0x50
850 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c ibutils-1.5.7/ibis/src/ibis_wrap.c
851 --- /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Nov 1 16:03:44 2010
852 +++ ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Jun 6 15:35:52 2011
853 @@ -2722,18 +2722,18 @@
854 typedef ib_mad_notice_attr_t smNotice;
855
856 /* these are the globals to be used for set/get */
857 - ib_node_info_t ibsm_node_info_obj;
858 - ib_port_info_t ibsm_port_info_obj;
859 - ib_switch_info_t ibsm_switch_info_obj;
860 - ibsm_lft_block_t ibsm_lft_block_obj;
861 - ibsm_mft_block_t ibsm_mft_block_obj;
862 - ib_guid_info_t ibsm_guid_info_obj;
863 - ib_pkey_table_t ibsm_pkey_table_obj;
864 - ib_slvl_table_t ibsm_slvl_table_obj;
865 - ib_vl_arb_table_t ibsm_vl_arb_table_obj;
866 - ib_node_desc_t ibsm_node_desc_obj;
867 - ib_sm_info_t ibsm_sm_info_obj;
868 - ib_mad_notice_attr_t ibsm_notice_obj;
869 + ib_node_info_t ibsm_node_info_obj __attribute__((aligned));
870 + ib_port_info_t ibsm_port_info_obj __attribute__((aligned));
871 + ib_switch_info_t ibsm_switch_info_obj __attribute__((aligned));
872 + ibsm_lft_block_t ibsm_lft_block_obj __attribute__((aligned));
873 + ibsm_mft_block_t ibsm_mft_block_obj __attribute__((aligned));
874 + ib_guid_info_t ibsm_guid_info_obj __attribute__((aligned));
875 + ib_pkey_table_t ibsm_pkey_table_obj __attribute__((aligned));
876 + ib_slvl_table_t ibsm_slvl_table_obj __attribute__((aligned));
877 + ib_vl_arb_table_t ibsm_vl_arb_table_obj __attribute__((aligned));
878 + ib_node_desc_t ibsm_node_desc_obj __attribute__((aligned));
879 + ib_sm_info_t ibsm_sm_info_obj __attribute__((aligned));
880 + ib_mad_notice_attr_t ibsm_notice_obj __attribute__((aligned));
881
882 /* TODO - define a Vendor Specific CR Read/Write attributes to use VL15 */
883
884 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibpm_base.h ibutils-1.5.7/ibis/src/ibpm_base.h
885 --- /tmp/ibutils-1.5.7/ibis/src/ibpm_base.h Wed Feb 24 02:09:25 2010
886 +++ ibutils-1.5.7/ibis/src/ibpm_base.h Thu Feb 24 16:51:18 2011
887 @@ -34,7 +34,11 @@
888 #ifndef _IBPM_BASE_H_
889 #define _IBPM_BASE_H_
890
891 +#if !(defined(__SVR4) && defined(__sun))
892 #include <endian.h>
893 +#else
894 +#include <infiniband/ofa_solaris.h>
895 +#endif
896
897 #define PERF_CLASS 0x04
898 #define PERF_CLASS_PORT_INFO 0x01
899 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibvs_base.h ibutils-1.5.7/ibis/src/ibvs_base.h
900 --- /tmp/ibutils-1.5.7/ibis/src/ibvs_base.h Wed Feb 24 02:09:25 2010
901 +++ ibutils-1.5.7/ibis/src/ibvs_base.h Thu Feb 24 16:51:18 2011
902 @@ -34,7 +34,11 @@
903 #ifndef _IBVS_BASE_H_
904 #define _IBVS_BASE_H_
905
906 +#if !(defined(__SVR4) && defined(__sun))
907 #include <endian.h>
908 +#else
909 +#include <infiniband/ofa_solaris.h>
910 +#endif
911
912 #define VS_CLASS 0x0a
913 #define VS_CLASS_PORT_INFO 0x01
914 diff -r -u /tmp/ibutils-1.5.7/ibis/src/swig_extended_obj.c ibutils-1.5.7/ibis/src/swig_extended_obj.c
915 --- /tmp/ibutils-1.5.7/ibis/src/swig_extended_obj.c Tue Mar 23 02:21:00 2010
916 +++ ibutils-1.5.7/ibis/src/swig_extended_obj.c Thu Feb 24 16:51:18 2011
917 @@ -30,6 +30,9 @@
918 * SOFTWARE.
919 *
920 */
921 +#if defined(__SVR4) && defined(__sun)
922 +#include <strings.h>
923 +#endif
924
925 /*--------------------------------------------------------------------
926 * This file holds an extended implementation for SWIG TCL Objects.
927 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibissh_wrap.cpp ibutils-1.5.7/ibis/src/ibissh_wrap.cpp
928 --- /tmp/ibutils-1.5.7/ibis/src/ibissh_wrap.cpp Mon Nov 1 16:03:44 2010
929 +++ ibutils-1.5.7/ibis/src/ibissh_wrap.cpp Thu Feb 24 16:51:18 2011
930 @@ -13,6 +13,11 @@
931 * Do not make changes to this file--changes will be lost!
932 *
933 */
934 +#if defined(__SVR4) && defined(__sun)
935 +#include <sys/types.h>
936 +#define TRUE _B_TRUE
937 +#define FALSE _B_FALSE
938 +#endif
939
940
941 #define SWIGCODE
942 @@ -823,7 +828,11 @@
943 // Write response - no data
944 // Note: The trailing space here is important !
945 sprintf(buff, "ACK ");
946 +#if defined(__SVR4) && defined(__sun)
947 + space_in_resp = (boolean_t)0;
948 +#else
949 space_in_resp = 0;
950 +#endif
951 }
952
953 if (is_multi && space_in_resp)
954 @@ -2722,18 +2731,18 @@
955 typedef ib_mad_notice_attr_t smNotice;
956
957 /* these are the globals to be used for set/get */
958 - ib_node_info_t ibsm_node_info_obj;
959 - ib_port_info_t ibsm_port_info_obj;
960 - ib_switch_info_t ibsm_switch_info_obj;
961 - ibsm_lft_block_t ibsm_lft_block_obj;
962 - ibsm_mft_block_t ibsm_mft_block_obj;
963 - ib_guid_info_t ibsm_guid_info_obj;
964 - ib_pkey_table_t ibsm_pkey_table_obj;
965 - ib_slvl_table_t ibsm_slvl_table_obj;
966 - ib_vl_arb_table_t ibsm_vl_arb_table_obj;
967 - ib_node_desc_t ibsm_node_desc_obj;
968 - ib_sm_info_t ibsm_sm_info_obj;
969 - ib_mad_notice_attr_t ibsm_notice_obj;
970 + ib_node_info_t ibsm_node_info_obj __attribute__((aligned));
971 + ib_port_info_t ibsm_port_info_obj __attribute__((aligned));
972 + ib_switch_info_t ibsm_switch_info_obj __attribute__((aligned));
973 + ibsm_lft_block_t ibsm_lft_block_obj __attribute__((aligned));
974 + ibsm_mft_block_t ibsm_mft_block_obj __attribute__((aligned));
975 + ib_guid_info_t ibsm_guid_info_obj __attribute__((aligned));
976 + ib_pkey_table_t ibsm_pkey_table_obj __attribute__((aligned));
977 + ib_slvl_table_t ibsm_slvl_table_obj __attribute__((aligned));
978 + ib_vl_arb_table_t ibsm_vl_arb_table_obj __attribute__((aligned));
979 + ib_node_desc_t ibsm_node_desc_obj __attribute__((aligned));
980 + ib_sm_info_t ibsm_sm_info_obj __attribute__((aligned));
981 + ib_mad_notice_attr_t ibsm_notice_obj __attribute__((aligned));
982
983 /* TODO - define a Vendor Specific CR Read/Write attributes to use VL15 */
984
985 diff -r -u /tmp/ibutils-1.5.7/ibis/tests/Makefile.in ibutils-1.5.7/ibis/tests/Makefile.in
986 --- /tmp/ibutils-1.5.7/ibis/tests/Makefile.in Tue Mar 8 03:09:51 2011
987 +++ ibutils-1.5.7/ibis/tests/Makefile.in Thu Feb 24 16:51:18 2011
988 @@ -53,7 +53,7 @@
989 pkglibdir = $(libdir)/@PACKAGE@
990 pkglibexecdir = $(libexecdir)/@PACKAGE@
991 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
992 -install_sh_DATA = $(install_sh) -c -m 644
993 +install_sh_DATA = $(install_sh) -c -m 744
994 install_sh_PROGRAM = $(install_sh) -c
995 install_sh_SCRIPT = $(install_sh) -c
996 INSTALL_HEADER = $(INSTALL_DATA)
997 diff -r -u /tmp/ibutils-1.5.7/ibis/Makefile.in ibutils-1.5.7/ibis/Makefile.in
998 --- /tmp/ibutils-1.5.7/ibis/Makefile.in Tue Mar 8 03:09:51 2011
999 +++ ibutils-1.5.7/ibis/Makefile.in Thu Feb 24 16:51:17 2011
1000 @@ -54,7 +54,7 @@
1001 pkglibdir = $(libdir)/@PACKAGE@
1002 pkglibexecdir = $(libexecdir)/@PACKAGE@
1003 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1004 -install_sh_DATA = $(install_sh) -c -m 644
1005 +install_sh_DATA = $(install_sh) -c -m 744
1006 install_sh_PROGRAM = $(install_sh) -c
1007 install_sh_SCRIPT = $(install_sh) -c
1008 INSTALL_HEADER = $(INSTALL_DATA)
1009 diff -r -u /tmp/ibutils-1.5.7/ibis/configure ibutils-1.5.7/ibis/configure
1010 --- /tmp/ibutils-1.5.7/ibis/configure Tue Mar 8 03:09:53 2011
1011 +++ ibutils-1.5.7/ibis/configure Thu Mar 10 18:33:26 2011
1012 @@ -2764,7 +2764,7 @@
1013
1014 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
1015
1016 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1017 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744'
1018
1019 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
1020 $as_echo_n "checking whether build environment is sane... " >&6; }
1021 @@ -6398,7 +6398,7 @@
1022
1023 # Determine commands to create old-style static archives.
1024 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
1025 -old_postinstall_cmds='chmod 644 $oldlib'
1026 +old_postinstall_cmds='chmod 744 $oldlib'
1027 old_postuninstall_cmds=
1028
1029 if test -n "$RANLIB"; then
1030 @@ -10087,6 +10087,7 @@
1031 ;;
1032 esac
1033 link_all_deplibs=yes
1034 + hardcode_libdir_flag_spec=
1035 ;;
1036
1037 sunos4*)
1038 @@ -12957,6 +12958,7 @@
1039 fi
1040 ;;
1041 esac
1042 + hardcode_libdir_flag_spec_CXX=
1043 ;;
1044
1045 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
1046 @@ -15295,7 +15297,8 @@
1047 { $as_echo "$as_me:${as_lineno-$LINENO}: OSM: build type $OSM_BUILD" >&5
1048 $as_echo "$as_me: OSM: build type $OSM_BUILD" >&6;}
1049
1050 - OSM_LDFLAGS="-Wl,-rpath -Wl,$with_osm_libs -L$with_osm_libs"
1051 + with_osm_libs=`echo "$with_osm_libs" | $SED -e "s/64//g"`
1052 + OSM_LDFLAGS="-L$with_osm_libs"
1053 if test $OSM_BUILD = openib; then
1054 osm_include_dir="$with_osm/include/infiniband"
1055 osm_extra_includes="-I$with_osm/include"
1056 @@ -15378,7 +15381,7 @@
1057 osm_debug_flags=
1058 fi
1059
1060 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1"
1061 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1"
1062 else
1063 with_osm=disabled
1064 OSM_CLFAGS=disabled
1065 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/aclocal.m4 ibutils-1.5.7/ibmgtsim/aclocal.m4
1066 --- /tmp/ibutils-1.5.7/ibmgtsim/aclocal.m4 Tue Mar 8 03:09:58 2011
1067 +++ ibutils-1.5.7/ibmgtsim/aclocal.m4 Thu Feb 24 16:51:18 2011
1068 @@ -1389,7 +1389,7 @@
1069
1070 # Determine commands to create old-style static archives.
1071 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
1072 -old_postinstall_cmds='chmod 644 $oldlib'
1073 +old_postinstall_cmds='chmod 744 $oldlib'
1074 old_postuninstall_cmds=
1075
1076 if test -n "$RANLIB"; then
1077 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/doc/Makefile.in ibutils-1.5.7/ibmgtsim/doc/Makefile.in
1078 --- /tmp/ibutils-1.5.7/ibmgtsim/doc/Makefile.in Tue Mar 8 03:10:01 2011
1079 +++ ibutils-1.5.7/ibmgtsim/doc/Makefile.in Thu Feb 24 16:51:18 2011
1080 @@ -52,7 +52,7 @@
1081 pkglibdir = $(libdir)/@PACKAGE@
1082 pkglibexecdir = $(libexecdir)/@PACKAGE@
1083 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1084 -install_sh_DATA = $(install_sh) -c -m 644
1085 +install_sh_DATA = $(install_sh) -c -m 744
1086 install_sh_PROGRAM = $(install_sh) -c
1087 install_sh_SCRIPT = $(install_sh) -c
1088 INSTALL_HEADER = $(INSTALL_DATA)
1089 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/src/Makefile.in ibutils-1.5.7/ibmgtsim/src/Makefile.in
1090 --- /tmp/ibutils-1.5.7/ibmgtsim/src/Makefile.in Tue Mar 8 03:10:01 2011
1091 +++ ibutils-1.5.7/ibmgtsim/src/Makefile.in Thu Feb 24 16:51:18 2011
1092 @@ -55,7 +55,7 @@
1093 pkglibdir = $(libdir)/@PACKAGE@
1094 pkglibexecdir = $(libexecdir)/@PACKAGE@
1095 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1096 -install_sh_DATA = $(install_sh) -c -m 644
1097 +install_sh_DATA = $(install_sh) -c -m 744
1098 install_sh_PROGRAM = $(install_sh) -c
1099 install_sh_SCRIPT = $(install_sh) -c
1100 INSTALL_HEADER = $(INSTALL_DATA)
1101 @@ -103,7 +103,7 @@
1102 am__base_list = \
1103 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1104 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1105 -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
1106 +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \
1107 "$(DESTDIR)$(pkgincludedir)"
1108 LTLIBRARIES = $(lib_LTLIBRARIES)
1109 libibmscli_la_LIBADD =
1110 @@ -430,8 +430,8 @@
1111 $(libibmscli_la_LINK) -rpath $(libdir) $(libibmscli_la_OBJECTS) $(libibmscli_la_LIBADD) $(LIBS)
1112 install-binPROGRAMS: $(bin_PROGRAMS)
1113 @$(NORMAL_INSTALL)
1114 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
1115 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
1116 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
1117 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
1118 for p in $$list; do echo "$$p $$p"; done | \
1119 sed 's/$(EXEEXT)$$//' | \
1120 while read p p1; do if test -f $$p || test -f $$p1; \
1121 @@ -455,13 +455,13 @@
1122
1123 uninstall-binPROGRAMS:
1124 @$(NORMAL_UNINSTALL)
1125 - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
1126 + @list='$(bin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
1127 files=`for p in $$list; do echo "$$p"; done | \
1128 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
1129 -e 's/$$/$(EXEEXT)/' `; \
1130 test -n "$$list" || exit 0; \
1131 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
1132 - cd "$(DESTDIR)$(bindir)" && rm -f $$files
1133 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
1134 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files
1135
1136 clean-binPROGRAMS:
1137 @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
1138 @@ -693,7 +693,7 @@
1139 install-binPROGRAMS: install-libLTLIBRARIES
1140
1141 installdirs:
1142 - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgincludedir)"; do \
1143 + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(pkgincludedir)"; do \
1144 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
1145 done
1146 install: install-am
1147 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/tests/Makefile.in ibutils-1.5.7/ibmgtsim/tests/Makefile.in
1148 --- /tmp/ibutils-1.5.7/ibmgtsim/tests/Makefile.in Tue Mar 8 03:10:01 2011
1149 +++ ibutils-1.5.7/ibmgtsim/tests/Makefile.in Thu Feb 24 16:51:19 2011
1150 @@ -53,7 +53,7 @@
1151 pkglibdir = $(libdir)/@PACKAGE@
1152 pkglibexecdir = $(libexecdir)/@PACKAGE@
1153 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1154 -install_sh_DATA = $(install_sh) -c -m 644
1155 +install_sh_DATA = $(install_sh) -c -m 744
1156 install_sh_PROGRAM = $(install_sh) -c
1157 install_sh_SCRIPT = $(install_sh) -c
1158 INSTALL_HEADER = $(INSTALL_DATA)
1159 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/utils/Makefile.in ibutils-1.5.7/ibmgtsim/utils/Makefile.in
1160 --- /tmp/ibutils-1.5.7/ibmgtsim/utils/Makefile.in Tue Mar 8 03:10:02 2011
1161 +++ ibutils-1.5.7/ibmgtsim/utils/Makefile.in Thu Feb 24 16:51:19 2011
1162 @@ -53,7 +53,7 @@
1163 pkglibdir = $(libdir)/@PACKAGE@
1164 pkglibexecdir = $(libexecdir)/@PACKAGE@
1165 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1166 -install_sh_DATA = $(install_sh) -c -m 644
1167 +install_sh_DATA = $(install_sh) -c -m 744
1168 install_sh_PROGRAM = $(install_sh) -c
1169 install_sh_SCRIPT = $(install_sh) -c
1170 INSTALL_HEADER = $(INSTALL_DATA)
1171 @@ -99,7 +99,7 @@
1172 am__base_list = \
1173 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1174 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1175 -am__installdirs = "$(DESTDIR)$(bindir)"
1176 +am__installdirs = "$(DESTDIR)$(sbindir)"
1177 SCRIPTS = $(bin_SCRIPTS)
1178 SOURCES =
1179 DIST_SOURCES =
1180 @@ -275,8 +275,8 @@
1181 $(am__aclocal_m4_deps):
1182 install-binSCRIPTS: $(bin_SCRIPTS)
1183 @$(NORMAL_INSTALL)
1184 - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
1185 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
1186 + test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
1187 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
1188 for p in $$list; do \
1189 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1190 if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
1191 @@ -294,19 +294,19 @@
1192 while read type dir files; do \
1193 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
1194 test -z "$$files" || { \
1195 - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
1196 - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
1197 + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
1198 + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
1199 } \
1200 ; done
1201
1202 uninstall-binSCRIPTS:
1203 @$(NORMAL_UNINSTALL)
1204 - @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
1205 + @list='$(bin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
1206 files=`for p in $$list; do echo "$$p"; done | \
1207 sed -e 's,.*/,,;$(transform)'`; \
1208 test -n "$$list" || exit 0; \
1209 - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
1210 - cd "$(DESTDIR)$(bindir)" && rm -f $$files
1211 + echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
1212 + cd "$(DESTDIR)$(sbindir)" && rm -f $$files
1213
1214 mostlyclean-libtool:
1215 -rm -f *.lo
1216 @@ -354,7 +354,7 @@
1217 check: check-am
1218 all-am: Makefile $(SCRIPTS)
1219 installdirs:
1220 - for dir in "$(DESTDIR)$(bindir)"; do \
1221 + for dir in "$(DESTDIR)$(sbindir)"; do \
1222 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
1223 done
1224 install: install-am
1225 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/Makefile.in ibutils-1.5.7/ibmgtsim/Makefile.in
1226 --- /tmp/ibutils-1.5.7/ibmgtsim/Makefile.in Tue Mar 8 03:10:02 2011
1227 +++ ibutils-1.5.7/ibmgtsim/Makefile.in Thu Feb 24 16:51:18 2011
1228 @@ -54,7 +54,7 @@
1229 pkglibdir = $(libdir)/@PACKAGE@
1230 pkglibexecdir = $(libexecdir)/@PACKAGE@
1231 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1232 -install_sh_DATA = $(install_sh) -c -m 644
1233 +install_sh_DATA = $(install_sh) -c -m 744
1234 install_sh_PROGRAM = $(install_sh) -c
1235 install_sh_SCRIPT = $(install_sh) -c
1236 INSTALL_HEADER = $(INSTALL_DATA)
1237 diff -r -u /tmp/ibutils-1.5.7/ibmgtsim/configure ibutils-1.5.7/ibmgtsim/configure
1238 --- /tmp/ibutils-1.5.7/ibmgtsim/configure Tue Mar 8 03:10:03 2011
1239 +++ ibutils-1.5.7/ibmgtsim/configure Thu Mar 10 18:33:27 2011
1240 @@ -2769,7 +2769,7 @@
1241
1242 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
1243
1244 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1245 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744'
1246
1247 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
1248 $as_echo_n "checking whether build environment is sane... " >&6; }
1249 @@ -6440,7 +6440,7 @@
1250
1251 # Determine commands to create old-style static archives.
1252 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
1253 -old_postinstall_cmds='chmod 644 $oldlib'
1254 +old_postinstall_cmds='chmod 744 $oldlib'
1255 old_postuninstall_cmds=
1256
1257 if test -n "$RANLIB"; then
1258 @@ -15360,7 +15360,7 @@
1259 osm_debug_flags=
1260 fi
1261
1262 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1"
1263 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1"
1264 else
1265 with_osm=disabled
1266 OSM_CLFAGS=disabled
1267 diff -r -u /tmp/ibutils-1.5.7/Makefile.in ibutils-1.5.7/Makefile.in
1268 --- /tmp/ibutils-1.5.7/Makefile.in Tue Mar 8 03:09:29 2011
1269 +++ ibutils-1.5.7/Makefile.in Thu Mar 10 18:33:24 2011
1270 @@ -54,7 +54,7 @@
1271 pkglibdir = $(libdir)/@PACKAGE@
1272 pkglibexecdir = $(libexecdir)/@PACKAGE@
1273 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
1274 -install_sh_DATA = $(install_sh) -c -m 644
1275 +install_sh_DATA = $(install_sh) -c -m 744
1276 install_sh_PROGRAM = $(install_sh) -c
1277 install_sh_SCRIPT = $(install_sh) -c
1278 INSTALL_HEADER = $(INSTALL_DATA)
1279 diff -r -u /tmp/ibutils-1.5.7/configure ibutils-1.5.7/configure
1280 --- /tmp/ibutils-1.5.7/configure Tue Mar 8 03:09:29 2011
1281 +++ ibutils-1.5.7/configure Thu Mar 10 18:33:24 2011
1282 @@ -1824,7 +1824,7 @@
1283
1284 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
1285
1286 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1287 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 744'
1288
1289 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
1290 $as_echo_n "checking whether build environment is sane... " >&6; }
1291 @@ -2450,7 +2450,7 @@
1292 osm_debug_flags=
1293 fi
1294
1295 - OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1"
1296 + OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags $osm_vendor_sel -D_BSD_SOURCE=1"
1297 else
1298 with_osm=disabled
1299 OSM_CLFAGS=disabled
Unleashed OS - userland