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

Diff of /eclass/libtool.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20