source: scripts/untested/blfs-patches/esound-0.2.35-libtool_skip_max_cmd_len-1.patch@ a8f17cf

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since a8f17cf was fd5b1fe, checked in by Jim Gifford <clfs@…>, 19 years ago

r588@server (orig r586): ryan | 2005-08-05 22:47:43 -0700
Add pile of new patches for blfs packages



  • Property mode set to 100644
File size: 6.2 KB
RevLine 
[fd5b1fe]1--- esound-0.2.35-orig/libtool 2005-02-01 00:30:40.242673038 +1100
2+++ esound-0.2.35/libtool 2005-02-01 00:38:58.192609620 +1100
3@@ -4057,125 +4057,6 @@
4 fi
5 fi
6
7- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
8- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
9- :
10- else
11- # The command line is too long to link in one step, link piecewise.
12- $echo "creating reloadable object files..."
13-
14- # Save the value of $output and $libobjs because we want to
15- # use them later. If we have whole_archive_flag_spec, we
16- # want to use save_libobjs as it was before
17- # whole_archive_flag_spec was expanded, because we can't
18- # assume the linker understands whole_archive_flag_spec.
19- # This may have to be revisited, in case too many
20- # convenience libraries get linked in and end up exceeding
21- # the spec.
22- if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
23- save_libobjs=$libobjs
24- fi
25- save_output=$output
26-
27- # Clear the reloadable object creation command queue and
28- # initialize k to one.
29- test_cmds=
30- concat_cmds=
31- objlist=
32- delfiles=
33- last_robj=
34- k=1
35- output=$output_objdir/$save_output-${k}.$objext
36- # Loop over the list of objects to be linked.
37- for obj in $save_libobjs
38- do
39- eval test_cmds=\"$reload_cmds $objlist $last_robj\"
40- if test "X$objlist" = X ||
41- { len=`expr "X$test_cmds" : ".*"` &&
42- test "$len" -le "$max_cmd_len"; }; then
43- objlist="$objlist $obj"
44- else
45- # The command $test_cmds is almost too long, add a
46- # command to the queue.
47- if test "$k" -eq 1 ; then
48- # The first file doesn't have a previous command to add.
49- eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
50- else
51- # All subsequent reloadable object files will link in
52- # the last one created.
53- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
54- fi
55- last_robj=$output_objdir/$save_output-${k}.$objext
56- k=`expr $k + 1`
57- output=$output_objdir/$save_output-${k}.$objext
58- objlist=$obj
59- len=1
60- fi
61- done
62- # Handle the remaining objects by creating one last
63- # reloadable object file. All subsequent reloadable object
64- # files will link in the last one created.
65- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
66- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
67-
68- if ${skipped_export-false}; then
69- $show "generating symbol list for \`$libname.la'"
70- export_symbols="$output_objdir/$libname.exp"
71- $run $rm $export_symbols
72- libobjs=$output
73- # Append the command to create the export file.
74- eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
75- fi
76-
77- # Set up a command to remove the reloadale object files
78- # after they are used.
79- i=0
80- while test "$i" -lt "$k"
81- do
82- i=`expr $i + 1`
83- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
84- done
85-
86- $echo "creating a temporary reloadable object file: $output"
87-
88- # Loop through the commands generated above and execute them.
89- save_ifs="$IFS"; IFS='~'
90- for cmd in $concat_cmds; do
91- IFS="$save_ifs"
92- $show "$cmd"
93- $run eval "$cmd" || exit $?
94- done
95- IFS="$save_ifs"
96-
97- libobjs=$output
98- # Restore the value of output.
99- output=$save_output
100-
101- if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
102- eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
103- fi
104- # Expand the library linking commands again to reset the
105- # value of $libobjs for piecewise linking.
106-
107- # Do each of the archive commands.
108- if test "$module" = yes && test -n "$module_cmds" ; then
109- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
110- cmds=$module_expsym_cmds
111- else
112- cmds=$module_cmds
113- fi
114- else
115- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
116- cmds=$archive_expsym_cmds
117- else
118- cmds=$archive_cmds
119- fi
120- fi
121-
122- # Append the command to remove the reloadable object files
123- # to the just-reset $cmds.
124- eval cmds=\"\$cmds~\$rm $delfiles\"
125- fi
126 save_ifs="$IFS"; IFS='~'
127 for cmd in $cmds; do
128 IFS="$save_ifs"
129@@ -5347,63 +5228,7 @@
130 else
131 eval cmds=\"$old_archive_cmds\"
132
133- if len=`expr "X$cmds" : ".*"` &&
134- test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
135- cmds=$old_archive_cmds
136- else
137- # the command line is too long to link in one step, link in parts
138- $echo "using piecewise archive linking..."
139- save_RANLIB=$RANLIB
140- RANLIB=:
141- objlist=
142- concat_cmds=
143- save_oldobjs=$oldobjs
144- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
145- # encoded into archives. This makes 'ar r' malfunction in
146- # this piecewise linking case whenever conflicting object
147- # names appear in distinct ar calls; check, warn and compensate.
148- if (for obj in $save_oldobjs
149- do
150- $echo "X$obj" | $Xsed -e 's%^.*/%%'
151- done | sort | sort -uc >/dev/null 2>&1); then
152- :
153- else
154- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
155- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
156- AR_FLAGS=cq
157- fi
158- # Is there a better way of finding the last object in the list?
159- for obj in $save_oldobjs
160- do
161- last_oldobj=$obj
162- done
163- for obj in $save_oldobjs
164- do
165- oldobjs="$objlist $obj"
166- objlist="$objlist $obj"
167- eval test_cmds=\"$old_archive_cmds\"
168- if len=`expr "X$test_cmds" : ".*"` &&
169- test "$len" -le "$max_cmd_len"; then
170- :
171- else
172- # the above command should be used before it gets too long
173- oldobjs=$objlist
174- if test "$obj" = "$last_oldobj" ; then
175- RANLIB=$save_RANLIB
176- fi
177- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
178- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
179- objlist=
180- fi
181- done
182- RANLIB=$save_RANLIB
183- oldobjs=$objlist
184- if test "X$oldobjs" = "X" ; then
185- eval cmds=\"\$concat_cmds\"
186- else
187- eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
188- fi
189- fi
190+ cmds=$old_archive_cmds
191 fi
192 save_ifs="$IFS"; IFS='~'
193 for cmd in $cmds; do
Note: See TracBrowser for help on using the repository browser.