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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.38

  ViewVC Help
Powered by ViewVC 1.1.20