/[gentoo-x86]/eclass/libtool.eclass
Gentoo

Diff of /eclass/libtool.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.3 Revision 1.40
1#!/bin/bash 1# Copyright 1999-2004 Gentoo Foundation
2# Copyright 1999-2002 Gentoo Technologies, Inc.
3# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.40 2004/10/20 14:29:26 vapier Exp $
4#
4# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
5# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.3 2002/06/05 23:41:36 azarah Exp $ 6#
6# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
7# relink and portage patch 8# relink and portage patch among others
9
8ECLASS=libtool 10ECLASS="libtool"
9newdepend sys-devel/libtool 11INHERITED="${INHERITED} ${ECLASS}"
12
13# 2004.09.25 rac
14# i have verified that at least one package can use this eclass and
15# build properly even without libtool installed yet, probably using
16# the files in the distribution. eliminating this dependency fixes
17# bug 65209, which is a showstopper for people doing installs using
18# stageballs <3. if anybody decides to revert this, please attempt
19# to find an alternate way of resolving that bug at the same time.
20
21#DEPEND="!bootstrap? ( sys-devel/libtool )"
10 22
11DESCRIPTION="Based on the ${ECLASS} eclass" 23DESCRIPTION="Based on the ${ECLASS} eclass"
12 24
25ELIBTOOL_VERSION="2.0.1"
26
27
28ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches"
29ELT_APPLIED_PATCHES=
30
31#
32# Returns all the directories containing ltmain.sh
33#
34ELT_find_ltmain_sh() {
35 local x=
36 local dirlist=
37
38 for x in $(find "${S}" -name 'ltmain.sh')
39 do
40 dirlist="${dirlist} ${x%/*}"
41 done
42
43 echo "${dirlist}"
44}
45
46#
47# See if we can apply $2 on $1, and if so, do it
48#
49ELT_try_and_apply_patch() {
50 local ret=0
51 local patch="$2"
52
53 # We only support patchlevel of 0 - why worry if its static patches?
54 if patch -p0 --dry-run $1 < ${patch} &>${T}/elibtool.log
55 then
56 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
57 patch -p0 $1 < ${patch} &>${T}/elibtool.log
58 ret=$?
59 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
60 else
61 ret=1
62 fi
63
64 return ${ret}
65}
66
67#
68# Run through the patches in $2 and see if any
69# apply to $1 ...
70#
71ELT_walk_patches() {
72 local x=
73 local y=
74 local ret=1
75 local patch_dir=
76
77 if [ -n "$2" ]
78 then
79 if [ -d "${ELT_PATCH_DIR}/$2" ]
80 then
81 patch_dir="${ELT_PATCH_DIR}/$2"
82 else
83 return ${ret}
84 fi
85
86 for x in $(ls -d "${patch_dir}"/* 2>/dev/null)
87 do
88 if [ -n "${x}" -a -f "${x}" ]
89 then
90 # For --remove-internal-dep ...
91 if [ -n "$3" ]
92 then
93 # For replace @REM_INT_DEP@ with what was passed
94 # to --remove-internal-dep
95 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \
96 ${T}/$$.rem_int_deps.patch
97
98 x="${T}/$$.rem_int_deps.patch"
99 fi
100
101 if ELT_try_and_apply_patch "$1" "${x}"
102 then
103 ret=0
104 break
105 fi
106 fi
107 done
108 fi
109
110 return ${ret}
111}
13 112
14elibtoolize() { 113elibtoolize() {
15
16 local x="" 114 local x=
17 local y="" 115 local y=
18 local dopatch="no"
19 local dotest="yes"
20 local dorelink="yes"
21 local doportage="yes"
22 local portage="no" 116 local do_portage="no"
117 local do_reversedeps="no"
118 local do_only_patches="no"
119 local deptoremove=
120 local my_dirlist=
121 local elt_patches="portage relink max_cmd_len sed test tmp"
122 local start_dir="${PWD}"
23 123
24 # Only apply portage patch, and dont "libtoolize --copy --force" 124 my_dirlist="$(ELT_find_ltmain_sh)"
25 # if all patches fail.
26 if [ "${1}" = "--portage" ]
27 then
28 portage="yes"
29 fi
30 125
31 for x in $(find_ltmain) 126 for x in "$@"
32 do 127 do
128 case "${x}" in
129 "--portage")
130 # Only apply portage patch, and don't
131 # 'libtoolize --copy --force' if all patches fail.
132 do_portage="yes"
133 ;;
134 "--reverse-deps")
135 # Apply the reverse-deps patch
136 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
137 do_reversedeps="yes"
138 elt_patches="${elt_patches} fix-relink"
139 ;;
140 "--patch-only")
141 # Do not run libtoolize if none of the patches apply ..
142 do_only_patches="yes"
143 ;;
144 "^--remove-internal-dep="*)
145 # We will replace @REM_INT_DEP@ with what is needed
146 # in ELT_walk_patches() ...
147 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')"
148
149 # Add the patch for this ...
150 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep"
151 ;;
152 "--shallow")
153 # Only patch the ltmain.sh in ${S}
154 if [ -f "${S}/ltmain.sh" ]
155 then
156 my_dirlist="${S}"
157 else
158 my_dirlist=
159 fi
160 ;;
161 "--no-uclibc")
162 NO_UCLIBCTOOLIZE=1
163 ;;
164 esac
165 done
166
167 if use ppc-macos ; then
168 glibtoolize --copy --force
169 darwintoolize
170 fi
171
172 for x in ${my_dirlist}
173 do
174 local tmp="$(echo "${x}" | sed -e "s|${S}||")"
175 export ELT_APPLIED_PATCHES=
176
33 cd ${x} 177 cd ${x}
34 einfo "Working directory: ${x}..." 178 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..."
35 dopatch="yes"
36 179
37 for y in test_patch relink_patch portage_patch 180 for y in ${elt_patches}
38 do 181 do
39 if ! eval ${y} --test $>${T}/libtool.foo 182 local ret=0
183
184 case "${y}" in
185 "rem-int-dep")
186 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
187 ret=$?
188 ;;
189 "fix-relink")
190 # Do not apply if we do not have the relink patch applied ...
191 if [ -n "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ]
192 then
193 ELT_walk_patches "${x}/ltmain.sh" "${y}"
194 ret=$?
195 fi
196 ;;
197 "max_cmd_len")
198 # Do not apply if $max_cmd_len is not used ...
199 if [ -n "$(grep 'max_cmd_len' "${x}/ltmain.sh")" ]
200 then
201 ELT_walk_patches "${x}/ltmain.sh" "${y}"
202 ret=$?
203 fi
204 ;;
205 *)
206 ELT_walk_patches "${x}/ltmain.sh" "${y}"
207 ret=$?
208 ;;
209 esac
210
211 if [ "${ret}" -ne 0 ]
40 then 212 then
41 case ${y} in 213 case ${y} in
42 test_patch)
43 # non critical patch
44 dotest="no"
45 ;;
46 relink_patch) 214 "relink")
47 # critical patch, but could be applied 215 # Critical patch, but could be applied ...
48 if [ -z "$(grep -e "inst_prefix_dir" ltmain.sh)" ] && \ 216 if [ -z "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ]
49 [ "${portage}" = "no" ]
50 then 217 then
51 dopatch="no" 218 ewarn " Could not apply relink.patch!"
52 fi
53 dorelink="no"
54 ;;
55 portage_patch)
56 # critical patch
57 if [ "${portage}" = "yes" ]
58 then
59 echo
60 eerror "Portage patch requested, but failed to apply!"
61 die
62 fi
63 dopatch="no"
64 doportage="no"
65 ;;
66 esac
67 fi
68 done
69
70 for y in test_patch relink_patch portage_patch
71 do
72 if [ "${dopatch}" = "yes" ]
73 then
74 case ${y} in
75 test_patch)
76 if [ "${dotest}" = "no" ]
77 then
78 continue
79 fi 219 fi
80 ;; 220 ;;
81 relink_patch) 221 "portage")
222 # Critical patch - for this one we abort, as it can really
223 # cause breakage without it applied!
82 if [ "${dorelink}" = "no" ] 224 if [ "${do_portage}" = "yes" ]
83 then 225 then
84 continue 226 # Stupid test to see if its already applied ...
85 fi 227 if [ -z "$(grep 'We do not want portage' "${x}/ltmain.sh")" ]
86 ;;
87 portage_patch)
88 if [ "${doportage}" = "no" ]
89 then 228 then
90 continue 229 echo
230 eerror "Portage patch requested, but failed to apply!"
231 die "Portage patch requested, but failed to apply!"
232 fi
233 else
234 ewarn " Could not apply portage.patch!"
235 ewarn " Please verify that it is not needed."
91 fi 236 fi
92 ;; 237 ;;
93 esac 238 esac
94 239 fi
95 einfo "Applying libtool-${y/_patch/}.patch..." 240
96 eval ${y} $>${T}/libtool.foo 241 if [ -z "${ELT_APPLIED_PATCHES}" ]
97 elif [ "${portage}" = "no" ]
98 then 242 then
243 if [ "${do_portage}" = "no" -a \
244 "${do_reversedeps}" = "no" -a \
245 "${do_only_patches}" = "no" -a \
246 "${deptoremove}" = "" ]
247 then
248 # Sometimes ltmain.sh is in a subdirectory ...
249 if [ ! -f ${x}/configure.in -a ! -f ${x}/configure.ac ]
250 then
251 if [ -f ${x}/../configure.in -o -f ${x}/../configure.ac ]
252 then
253 cd ${x}/../
254 fi
255 fi
256
257 if which libtoolize &>/dev/null
258 then
259 ewarn "Cannot apply any patch, running libtoolize..."
99 libtoolize --copy --force 260 libtoolize --copy --force
261 fi
262 cd ${x}
100 break 263 break
264 fi
101 fi 265 fi
102 done 266 done
103 done 267 done
104}
105 268
106# 269 if [ -f libtool ]
107# Returns all the directories containing ltmain.sh
108#
109find_ltmain() {
110
111 local x=""
112 local dirlist=""
113
114 for x in $(find ${S} -name 'ltmain.sh')
115 do
116 dirlist="${dirlist} ${x%/*}"
117 done
118
119 echo "${dirlist}"
120}
121
122#
123# Various patches we want to apply.
124#
125# Contains: portage_patch
126# relink_patch
127# test_patch
128#
129portage_patch() {
130
131 local opts=""
132
133 if [ "${1}" = "--test" ]
134 then 270 then
135 opts="--force --dry-run" 271 rm -f libtool
136 fi 272 fi
137 273
138 patch ${opts} -p0 <<-"ENDPATCH" 274 cd "${start_dir}"
139 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002
140 +++ ltmain.sh Sun May 26 19:50:52 2002
141 @@ -3940,9 +3940,39 @@
142 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
143 exit 1
144 fi
145 - newdependency_libs="$newdependency_libs $libdir/$name"
146 + # We do not want portage's install root ($D) present. Check only for
147 + # this if the .la is being installed.
148 + if test "$installed" = yes; then
149 + mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:${D}::g" -e 's://:/:g'`"
150 + else
151 + mynewdependency_lib="$libdir/$name"
152 + fi
153 + # Do not add duplicates
154 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"
155 + then
156 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
157 + fi
158 + ;;
159 + *)
160 + if test "$installed" = yes; then
161 + # We do not want portage's build root ($S} present.
162 + if test -n "`echo $deplib |grep -e "${S}"`"
163 + then
164 + newdependency_libs=""
165 + # We do not want portage's install root ($D) present.
166 + elif test -n "`echo $deplib |grep -e "${D}"`"
167 + then
168 + mynewdependency_lib="`echo "$deplib" |sed -e "s:${D}::g" -e 's://:/:g'`"
169 + fi
170 + else
171 + mynewdependency_lib="$deplib"
172 + fi
173 + # Do not add duplicates
174 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"
175 + then
176 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
177 + fi
178 ;;
179 - *) newdependency_libs="$newdependency_libs $deplib" ;;
180 esac
181 done
182 dependency_libs="$newdependency_libs"
183 @@ -3975,6 +4005,10 @@
184 case $host,$output,$installed,$module,$dlname in
185 *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
186 esac
187 + # Do not add duplicates
188 + if test "$installed" = yes; then
189 + install_libdir="`echo "$install_libdir" |sed -e "s:${D}::g" -e 's://:/:g'`"
190 + fi
191 $echo > $output "\
192 # $outputname - a libtool library file
193 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
194 ENDPATCH
195}
196 275
197relink_patch() { 276 uclibctoolize
277}
198 278
279uclibctoolize() {
280 [ -n "${NO_UCLIBCTOOLIZE}" ] && return 0
281
199 local opts="" 282 local targets=""
200 local retval=0 283 local x
201 284
202 if [ "${1}" = "--test" ] 285 if [ -z "$@" ] ; then
203 then 286 targets="$(find ${S} -name configure -o -name ltconfig)"
204 opts="--force --dry-run"
205 fi 287 fi
206 288
207 patch ${opts} -p0 <<-"ENDPATCH" 289 einfo "Applying uClibc/libtool patches ..."
208 --- ltmain.sh Sun Aug 12 18:08:05 2001 290 for x in ${targets} ; do
209 +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001 291 [ ! -s "${x}" ] && continue
210 @@ -827,6 +827,7 @@ 292 case $(basename "${x}") in
211 linker_flags= 293 configure)
212 dllsearchpath= 294 if grep 'Transform linux' "${x}" >/dev/null ; then
213 lib_search_path=`pwd` 295 ebegin " Fixing \${S}${x/${S}}"
214 + inst_prefix_dir= 296 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
215 297 eend $? "PLEASE CHECK ${x}"
216 avoid_version=no
217 dlfiles=
218 @@ -959,6 +960,11 @@
219 prev=
220 continue
221 ;;
222 + inst_prefix)
223 + inst_prefix_dir="$arg"
224 + prev=
225 + continue
226 + ;;
227 release)
228 release="-$arg"
229 prev=
230 @@ -1167,6 +1173,11 @@
231 continue
232 ;;
233
234 + -inst-prefix-dir)
235 + prev=inst_prefix
236 + continue
237 + ;;
238 +
239 # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
240 # so, if we see these flags be careful not to treat them like -L
241 -L[A-Z][A-Z]*:*)
242 @@ -2231,7 +2242,16 @@
243 if test "$hardcode_direct" = yes; then
244 add="$libdir/$linklib"
245 elif test "$hardcode_minus_L" = yes; then
246 - add_dir="-L$libdir"
247 + # Try looking first in the location we're being installed to.
248 + add_dir=
249 + if test -n "$inst_prefix_dir"; then
250 + case "$libdir" in
251 + [\\/]*)
252 + add_dir="-L$inst_prefix_dir$libdir"
253 + ;;
254 + esac
255 + fi
256 + add_dir="$add_dir -L$libdir"
257 add="-l$name"
258 elif test "$hardcode_shlibpath_var" = yes; then
259 case :$finalize_shlibpath: in
260 @@ -2241,7 +2261,16 @@
261 add="-l$name"
262 else
263 # We cannot seem to hardcode it, guess we'll fake it.
264 - add_dir="-L$libdir"
265 + # Try looking first in the location we're being installed to.
266 + add_dir=
267 + if test -n "$inst_prefix_dir"; then
268 + case "$libdir" in
269 + [\\/]*)
270 + add_dir="-L$inst_prefix_dir$libdir"
271 + ;;
272 + esac
273 + fi
274 + add_dir="$add_dir -L$libdir"
275 add="-l$name"
276 fi
277
278 @@ -4622,12 +4651,30 @@
279 dir="$dir$objdir"
280
281 if test -n "$relink_command"; then
282 + # Determine the prefix the user has applied to our future dir.
283 + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
284 +
285 + # Don't allow the user to place us outside of our expected
286 + # location b/c this prevents finding dependent libraries that
287 + # are installed to the same prefix.
288 + if test "$inst_prefix_dir" = "$destdir"; then
289 + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
290 + exit 1
291 + fi
292 +
293 + if test -n "$inst_prefix_dir"; then
294 + # Stick the inst_prefix_dir data into the link command.
295 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
296 + else
297 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
298 + fi
299 +
300 $echo "$modename: warning: relinking \`$file'" 1>&2
301 $show "$relink_command"
302 if $run eval "$relink_command"; then :
303 else
304 $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
305 - continue
306 + exit 1
307 fi
308 fi 298 fi
309
310 @@ -4782,7 +4829,11 @@
311 if test "$finalize" = yes && test -z "$run"; then
312 tmpdir="/tmp"
313 test -n "$TMPDIR" && tmpdir="$TMPDIR"
314 - tmpdir="$tmpdir/libtool-$$"
315 + tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
316 + if test $? = 0 ; then :
317 + else
318 + tmpdir="$tmpdir/libtool-$$"
319 + fi
320 if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
321 else
322 $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
323 ENDPATCH
324
325 retval=$?
326
327 # This one dont apply clean to libtool-1.4.2a, so do it manually.
328 if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ]
329 then
330 cp ltmain.sh ltmain.sh.orig
331 sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \
332 ltmain.sh.orig > ltmain.sh
333 rm -f ltmain.sh.orig
334 fi
335
336 return ${retval}
337}
338
339test_patch() {
340
341 local opts=""
342
343 if [ "${1}" = "--test" ]
344 then
345 opts="--force --dry-run"
346 fi
347
348 patch ${opts} -p0 <<-"ENDPATCH"
349 --- ./ltmain.sh Tue May 29 19:16:03 2001
350 +++ ./ltmain.sh Tue May 29 21:26:50 2001
351 @@ -459,7 +459,7 @@
352 pic_mode=default
353 ;;
354 esac
355 - if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
356 + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
357 # non-PIC code in shared libraries is not supported
358 pic_mode=default
359 fi
360 @@ -1343,7 +1343,7 @@
361 ;; 299 ;;
362 esac 300
363 for pass in $passes; do 301 ltconfig)
364 - if test $linkmode = prog; then 302 local ver="$(grep '^VERSION=' ${x})"
365 + if test "$linkmode" = prog; then 303 ver="${ver/VERSION=}"
366 # Determine which files to process 304 [ "${ver:0:3}" == "1.4" ] && ver="1.3" # 1.4 and 1.3 are compat
367 case $pass in 305 ebegin " Fixing \${S}${x/${S}}"
368 dlopen) 306 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null
369 @@ -1360,11 +1360,11 @@ 307 eend $? "PLEASE CHECK ${x}"
370 found=no 308 ;;
371 case $deplib in 309 esac
372 -l*) 310 done
373 - if test $linkmode = oldlib && test $linkmode = obj; then 311}
374 + if test "$linkmode" = oldlib && test "$linkmode" = obj; then 312
375 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 313darwintoolize() {
376 continue 314 local targets=""
377 fi 315 local x
378 - if test $pass = conv; then 316
379 + if test "$pass" = conv; then 317 if [ -z "$@" ] ; then
380 deplibs="$deplib $deplibs" 318 targets="$(find ${S} -name ltmain.sh -o -name ltconfig)"
381 continue 319 fi
382 fi 320
383 @@ -1384,7 +1384,7 @@ 321 einfo "Applying Darwin/libtool patches ..."
384 finalize_deplibs="$deplib $finalize_deplibs" 322 for x in ${targets} ; do
385 else 323 [ ! -s "${x}" ] && continue
386 deplibs="$deplib $deplibs" 324 case $(basename "${x}") in
387 - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" 325 ltmain.sh|ltconfig)
388 + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" 326 local ver="$(grep '^VERSION=' ${x})"
389 fi 327 ver="${ver/VERSION=}"
390 continue 328 if [ "${ver:0:3}" == "1.4" -o "${ver:0:3}" == "1.5" ];
391 fi 329 then
392 @@ -1393,16 +1393,16 @@ 330 ver="1.3" # 1.4, 1.5 and 1.3 are compat
393 case $linkmode in
394 lib)
395 deplibs="$deplib $deplibs"
396 - test $pass = conv && continue
397 + test "$pass" = conv && continue
398 newdependency_libs="$deplib $newdependency_libs"
399 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
400 ;;
401 prog)
402 - if test $pass = conv; then
403 + if test "$pass" = conv; then
404 deplibs="$deplib $deplibs"
405 continue
406 fi
407 - if test $pass = scan; then
408 + if test "$pass" = scan; then
409 deplibs="$deplib $deplibs"
410 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
411 else
412 @@ -1417,7 +1417,7 @@
413 continue
414 ;; # -L
415 -R*)
416 - if test $pass = link; then
417 + if test "$pass" = link; then
418 dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
419 # Make sure the xrpath contains only unique directories.
420 case "$xrpath " in
421 @@ -1430,7 +1430,7 @@
422 ;;
423 *.la) lib="$deplib" ;;
424 *.$libext)
425 - if test $pass = conv; then
426 + if test "$pass" = conv; then
427 deplibs="$deplib $deplibs"
428 continue
429 fi
430 @@ -1451,7 +1451,7 @@
431 continue
432 ;;
433 prog)
434 - if test $pass != link; then
435 + if test "$pass" != link; then
436 deplibs="$deplib $deplibs"
437 else
438 compile_deplibs="$deplib $compile_deplibs"
439 @@ -1462,7 +1462,7 @@
440 esac # linkmode
441 ;; # *.$libext
442 *.lo | *.$objext)
443 - if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
444 + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
445 # If there is no dlopen support or we're linking statically,
446 # we need to preload.
447 newdlprefiles="$newdlprefiles $deplib"
448 @@ -1512,13 +1512,13 @@
449
450 if test "$linkmode,$pass" = "lib,link" ||
451 test "$linkmode,$pass" = "prog,scan" ||
452 - { test $linkmode = oldlib && test $linkmode = obj; }; then
453 + { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
454 # Add dl[pre]opened files of deplib
455 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
456 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
457 fi 331 fi
458 332
459 - if test $pass = conv; then 333 ebegin " Fixing \${S}${x/${S}}"
460 + if test "$pass" = conv; then 334 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/$(basename "${x}")-${ver:0:3}.patch" > /dev/null
461 # Only check for convenience libraries 335 eend $? "PLEASE CHECK ${x}"
462 deplibs="$lib $deplibs" 336 ;;
463 if test -z "$libdir"; then 337 esac
464 @@ -1537,7 +1537,7 @@
465 esac
466 tmp_libs="$tmp_libs $deplib"
467 done
468 - elif test $linkmode != prog && test $linkmode != lib; then
469 + elif test "$linkmode" != prog && test "$linkmode" != lib; then
470 $echo "$modename: \`$lib' is not a convenience library" 1>&2
471 exit 1
472 fi
473 @@ -1555,7 +1555,7 @@
474 fi
475
476 # This library was specified with -dlopen.
477 - if test $pass = dlopen; then
478 + if test "$pass" = dlopen; then
479 if test -z "$libdir"; then
480 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
481 exit 1
482 @@ -1604,7 +1604,7 @@
483 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
484
485 # This library was specified with -dlpreopen.
486 - if test $pass = dlpreopen; then
487 + if test "$pass" = dlpreopen; then
488 if test -z "$libdir"; then
489 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
490 exit 1
491 @@ -1623,7 +1623,7 @@
492
493 if test -z "$libdir"; then
494 # Link the convenience library
495 - if test $linkmode = lib; then
496 + if test "$linkmode" = lib; then
497 deplibs="$dir/$old_library $deplibs"
498 elif test "$linkmode,$pass" = "prog,link"; then
499 compile_deplibs="$dir/$old_library $compile_deplibs"
500 @@ -1634,7 +1634,7 @@
501 continue
502 fi
503
504 - if test $linkmode = prog && test $pass != link; then
505 + if test "$linkmode" = prog && test "$pass" != link; then
506 newlib_search_path="$newlib_search_path $ladir"
507 deplibs="$lib $deplibs"
508
509 @@ -1671,7 +1671,7 @@
510 # Link against this shared library
511
512 if test "$linkmode,$pass" = "prog,link" ||
513 - { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
514 + { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
515 # Hardcode the library path.
516 # Skip directories that are in the system default run-time
517 # search path.
518 @@ -1693,7 +1693,7 @@
519 esac
520 ;;
521 esac
522 - if test $linkmode = prog; then
523 + if test "$linkmode" = prog; then
524 # We need to hardcode the library path
525 if test -n "$shlibpath_var"; then
526 # Make sure the rpath contains only unique directories.
527 @@ -1777,7 +1777,7 @@
528 linklib=$newlib
529 fi # test -n $old_archive_from_expsyms_cmds
530
531 - if test $linkmode = prog || test "$mode" != relink; then
532 + if test "$linkmode" = prog || test "$mode" != relink; then
533 add_shlibpath=
534 add_dir=
535 add=
536 @@ -1826,7 +1826,7 @@
537 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
538 esac
539 fi
540 - if test $linkmode = prog; then
541 + if test "$linkmode" = prog; then
542 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
543 test -n "$add" && compile_deplibs="$add $compile_deplibs"
544 else
545 @@ -1843,7 +1843,7 @@
546 fi
547 fi
548
549 - if test $linkmode = prog || test "$mode" = relink; then
550 + if test "$linkmode" = prog || test "$mode" = relink; then
551 add_shlibpath=
552 add_dir=
553 add=
554 @@ -1865,7 +1865,7 @@
555 add="-l$name"
556 fi
557
558 - if test $linkmode = prog; then
559 + if test "$linkmode" = prog; then
560 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
561 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
562 else
563 @@ -1873,7 +1873,7 @@
564 test -n "$add" && deplibs="$add $deplibs"
565 fi
566 fi
567 - elif test $linkmode = prog; then
568 + elif test "$linkmode" = prog; then
569 if test "$alldeplibs" = yes &&
570 { test "$deplibs_check_method" = pass_all ||
571 { test "$build_libtool_libs" = yes &&
572 @@ -1932,9 +1932,9 @@
573 fi
574 fi # link shared/static library?
575
576 - if test $linkmode = lib; then
577 + if test "$linkmode" = lib; then
578 if test -n "$dependency_libs" &&
579 - { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
580 + { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
581 test $link_static = yes; }; then
582 # Extract -R from dependency_libs
583 temp_deplibs=
584 @@ -1964,7 +1964,7 @@
585 tmp_libs="$tmp_libs $deplib"
586 done
587
588 - if test $link_all_deplibs != no; then
589 + if test "$link_all_deplibs" != no; then
590 # Add the search paths of all dependency libraries
591 for deplib in $dependency_libs; do
592 case $deplib in
593 @@ -2007,15 +2007,15 @@
594 fi # link_all_deplibs != no
595 fi # linkmode = lib
596 done # for deplib in $libs
597 - if test $pass = dlpreopen; then
598 + if test "$pass" = dlpreopen; then
599 # Link the dlpreopened libraries before other libraries
600 for deplib in $save_deplibs; do
601 deplibs="$deplib $deplibs"
602 done 338 done
603 fi
604 - if test $pass != dlopen; then
605 - test $pass != scan && dependency_libs="$newdependency_libs"
606 - if test $pass != conv; then
607 + if test "$pass" != dlopen; then
608 + test "$pass" != scan && dependency_libs="$newdependency_libs"
609 + if test "$pass" != conv; then
610 # Make sure lib_search_path contains only unique directories.
611 lib_search_path=
612 for dir in $newlib_search_path; do
613 @@ -2073,7 +2073,7 @@
614 deplibs=
615 fi
616 done # for pass
617 - if test $linkmode = prog; then
618 + if test "$linkmode" = prog; then
619 dlfiles="$newdlfiles"
620 dlprefiles="$newdlprefiles"
621 fi
622 @@ -2410,7 +2410,7 @@
623 ;;
624 *)
625 # Add libc to deplibs on all other systems if necessary.
626 - if test $build_libtool_need_lc = "yes"; then
627 + if test "$build_libtool_need_lc" = "yes"; then
628 deplibs="$deplibs -lc"
629 fi
630 ;;
631 @@ -2683,7 +2683,7 @@
632
633 # Test again, we may have decided not to build it any more
634 if test "$build_libtool_libs" = yes; then
635 - if test $hardcode_into_libs = yes; then
636 + if test "$hardcode_into_libs" = yes; then
637 # Hardcode the library paths
638 hardcode_libdirs=
639 dep_rpath=
640 ENDPATCH
641} 339}
642

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.40

  ViewVC Help
Powered by ViewVC 1.1.20