/[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.68
1#!/bin/bash 1# Copyright 1999-2005 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.68 2006/04/08 00:46:22 flameeyes 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
8ECLASS=libtool 9
9newdepend sys-devel/libtool 10
11# 2004.09.25 rac
12# i have verified that at least one package can use this eclass and
13# build properly even without libtool installed yet, probably using
14# the files in the distribution. eliminating this dependency fixes
15# bug 65209, which is a showstopper for people doing installs using
16# stageballs <3. if anybody decides to revert this, please attempt
17# to find an alternate way of resolving that bug at the same time.
10 18
11DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
12 20
21ELIBTOOL_VERSION="2.0.2"
22
23ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
24ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH=
26
27#
28# Returns all the directories containing ltmain.sh
29#
30ELT_find_ltmain_sh() {
31 local x=
32 local dirlist=
33
34 for x in $(find "${S}" -name 'ltmain.sh') ; do
35 dirlist="${dirlist} ${x%/*}"
36 done
37
38 echo "${dirlist}"
39}
40
41#
42# See if we can apply $2 on $1, and if so, do it
43#
44ELT_try_and_apply_patch() {
45 local ret=0
46 local file=$1
47 local patch=$2
48
49 # We only support patchlevel of 0 - why worry if its static patches?
50 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
52 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
53 &> "${T}/elibtool.log"
54 ret=$?
55 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
56 else
57 ret=1
58 fi
59
60 return "${ret}"
61}
62
63#
64# Get string version of ltmain.sh or ltconfig (passed as $1)
65#
66ELT_libtool_version() {
67 local ltmain_sh=$1
68 local version=
69
70 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
71 echo "${VERSION}")
72 [[ -z ${version} ]] && version="0"
73
74 echo "${version}"
75}
76
77#
78# Run through the patches in $2 and see if any
79# apply to $1 ...
80#
81ELT_walk_patches() {
82 local x=
83 local y=
84 local ret=1
85 local file=$1
86 local patch_set=$2
87 local patch_dir=
88 local rem_int_dep=$3
89
90 if [[ -n ${patch_set} ]] ; then
91 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
92 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
93 else
94 return "${ret}"
95 fi
96
97 # Go through the patches in reverse order (large to small)
98 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
99 if [[ -n ${x} && -f ${x} ]] ; then
100 # For --remove-internal-dep ...
101 if [[ -n ${rem_int_dep} ]] ; then
102 # For replace @REM_INT_DEP@ with what was passed
103 # to --remove-internal-dep
104 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
105 "${T}/$$.rem_int_deps.patch"
106
107 x="${T}/$$.rem_int_deps.patch"
108 fi
109
110 if ELT_try_and_apply_patch "${file}" "${x}" ; then
111 ret=0
112 break
113 fi
114 fi
115 done
116 fi
117
118 return "${ret}"
119}
13 120
14elibtoolize() { 121elibtoolize() {
15
16 local x="" 122 local x=
17 local y="" 123 local y=
18 local dopatch="no"
19 local dotest="yes"
20 local dorelink="yes"
21 local doportage="yes"
22 local portage="no" 124 local do_portage="no"
125 local do_reversedeps="no"
126 local do_only_patches="no"
127 local do_uclibc="yes"
128 local deptoremove=
129 local my_dirlist=
130 local elt_patches="portage relink max_cmd_len sed test tmp"
131 local start_dir=${PWD}
23 132
24 # Only apply portage patch, and dont "libtoolize --copy --force" 133 my_dirlist=$(ELT_find_ltmain_sh)
25 # if all patches fail. 134
26 if [ "${1}" = "--portage" ] 135 for x in "$@" ; do
27 then 136 case "${x}" in
137 "--portage")
138 # Only apply portage patch, and don't
139 # 'libtoolize --copy --force' if all patches fail.
28 portage="yes" 140 do_portage="yes"
141 ;;
142 "--reverse-deps")
143 # Apply the reverse-deps patch
144 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
145 do_reversedeps="yes"
146 elt_patches="${elt_patches} fix-relink"
147 ;;
148 "--patch-only")
149 # Do not run libtoolize if none of the patches apply ..
150 do_only_patches="yes"
151 ;;
152 "^--remove-internal-dep="*)
153 # We will replace @REM_INT_DEP@ with what is needed
154 # in ELT_walk_patches() ...
155 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
156
157 # Add the patch for this ...
158 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
159 ;;
160 "--shallow")
161 # Only patch the ltmain.sh in ${S}
162 if [[ -f ${S}/ltmain.sh ]] ; then
163 my_dirlist=${S}
164 else
165 my_dirlist=
166 fi
167 ;;
168 "--no-uclibc")
169 do_uclibc="no"
170 ;;
171 *)
172 eerror "Invalid elibtoolize option: ${x}"
173 die "elibtoolize called with ${x} ??"
174 esac
175 done
176
177 [[ ${do_uclibc} == "yes" ]] && \
178 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
179
180 [[ ${CHOST} == *"-freebsd"* ]] && \
181 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
182
183 if useq ppc-macos ; then
184 local opts
185 [[ -f Makefile.am ]] && opts="--automake"
186 glibtoolize --copy --force ${opts}
187
188 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
29 fi 189 fi
30 190
31 for x in $(find_ltmain) 191 for x in ${my_dirlist} ; do
32 do 192 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
193 export ELT_APPLIED_PATCHES=
194 export ELT_LTMAIN_SH="${x}/ltmain.sh"
195
196 [[ -f ${x}/.elibtoolized ]] && continue
197
33 cd ${x} 198 cd ${x}
34 einfo "Working directory: ${x}..." 199 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
35 dopatch="yes"
36 200
37 for y in test_patch relink_patch portage_patch 201 for y in ${elt_patches} ; do
38 do 202 local ret=0
39 if ! eval ${y} --test $>${T}/libtool.foo 203
40 then 204 case "${y}" in
205 "portage")
206 # Stupid test to see if its already applied ...
207 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
208 ELT_walk_patches "${x}/ltmain.sh" "${y}"
209 ret=$?
210 fi
211 ;;
212 "rem-int-dep")
213 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
214 ret=$?
215 ;;
216 "fix-relink")
217 # Do not apply if we do not have the relink patch applied ...
218 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
219 ELT_walk_patches "${x}/ltmain.sh" "${y}"
220 ret=$?
221 fi
222 ;;
223 "max_cmd_len")
224 # Do not apply if $max_cmd_len is not used ...
225 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
226 ELT_walk_patches "${x}/ltmain.sh" "${y}"
227 ret=$?
228 fi
229 ;;
230 "uclibc-conf")
231 if [[ -e ${x}/configure && \
232 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
233 ELT_walk_patches "${x}/configure" "${y}"
234 ret=$?
235 # ltmain.sh and co might be in a subdirectory ...
236 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
237 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
238 ELT_walk_patches "${x}/../configure" "${y}"
239 ret=$?
240 fi
241 ;;
242 "uclibc-ltconf")
243 # Newer libtoolize clears ltconfig, as not used anymore
244 if [[ -s ${x}/ltconfig ]] ; then
245 ELT_walk_patches "${x}/ltconfig" "${y}"
246 ret=$?
247 fi
248 ;;
249 "fbsd-conf")
250 if [[ -e ${x}/configure && \
251 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
252 ELT_walk_patches "${x}/configure" "${y}"
253 ret=$?
254 # ltmain.sh and co might be in a subdirectory ...
255 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
256 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
257 ELT_walk_patches "${x}/../configure" "${y}"
258 ret=$?
259 fi
260 ;;
261 "fbsd-ltconf")
262 if [[ -s ${x}/ltconfig ]] ; then
263 ELT_walk_patches "${x}/ltconfig" "${y}"
264 ret=$?
265 fi
266 ;;
267 "darwin-ltconf")
268 # Newer libtoolize clears ltconfig, as not used anymore
269 if [[ -s ${x}/ltconfig ]] ; then
270 ELT_walk_patches "${x}/ltconfig" "${y}"
271 ret=$?
272 fi
273 ;;
274 *)
275 ELT_walk_patches "${x}/ltmain.sh" "${y}"
276 ret=$?
277 ;;
278 esac
279
280 if [[ ${ret} -ne 0 ]] ; then
41 case ${y} in 281 case ${y} in
42 test_patch) 282 "relink")
43 # non critical patch 283 local version=$(ELT_libtool_version "${x}/ltmain.sh")
44 dotest="no" 284 # Critical patch, but could be applied ...
285 # FIXME: Still need a patch for ltmain.sh > 1.4.0
286 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
287 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
288 ewarn " Could not apply relink.patch!"
289 fi
45 ;; 290 ;;
46 relink_patch) 291 "portage")
47 # critical patch, but could be applied 292 # Critical patch - for this one we abort, as it can really
48 if [ -z "$(grep -e "inst_prefix_dir" ltmain.sh)" ] && \ 293 # cause breakage without it applied!
49 [ "${portage}" = "no" ] 294 if [[ ${do_portage} == "yes" ]] ; then
50 then 295 # Stupid test to see if its already applied ...
51 dopatch="no" 296 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
297 echo
298 eerror "Portage patch requested, but failed to apply!"
299 eerror "Please bug azarah or vapier to add proper patch."
300 die "Portage patch requested, but failed to apply!"
301 fi
302 else
303 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
304 # ewarn " Portage patch seems to be already applied."
305 # ewarn " Please verify that it is not needed."
306 :
307 else
308 local version=$( \
309 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
310 echo "${VERSION}")
311
312 echo
313 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
314 eerror "Please bug azarah or vapier to add proper patch."
315 die "Portage patch failed to apply!"
316 fi
317 # We do not want to run libtoolize ...
318 ELT_APPLIED_PATCHES="portage"
52 fi 319 fi
53 dorelink="no"
54 ;; 320 ;;
55 portage_patch) 321 "uclibc-"*)
56 # critical patch 322 [[ ${CHOST} == *"-uclibc" ]] && \
57 if [ "${portage}" = "yes" ] 323 ewarn " uClibc patch set '${y}' failed to apply!"
58 then 324 ;;
59 echo 325 "fbsd-"*)
60 eerror "Portage patch requested, but failed to apply!" 326 if [[ ${CHOST} == *"-freebsd"* ]] ; then
327 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
328 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
329 eerror " FreeBSD patch set '${y}' failed to apply!"
330 die "FreeBSD patch set '${y}' failed to apply!"
61 die 331 fi
62 fi 332 fi
63 dopatch="no" 333 ;;
64 doportage="no" 334 "darwin-"*)
335 useq ppc-macos && \
336 ewarn " Darwin patch set '${y}' failed to apply!"
65 ;; 337 ;;
66 esac 338 esac
67 fi 339 fi
68 done 340 done
69 341
70 for y in test_patch relink_patch portage_patch 342 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
71 do 343 if [[ ${do_portage} == "no" && \
72 if [ "${dopatch}" = "yes" ] 344 ${do_reversedeps} == "no" && \
345 ${do_only_patches} == "no" && \
346 ${deptoremove} == "" ]]
73 then 347 then
74 case ${y} in 348 ewarn "Cannot apply any patches, please file a bug about this"
75 test_patch) 349 break
76 if [ "${dotest}" = "no" ] 350
77 then 351 # Sometimes ltmain.sh is in a subdirectory ...
78 continue 352 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
353 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
354 cd "${x}"/../
79 fi 355 fi
80 ;;
81 relink_patch)
82 if [ "${dorelink}" = "no" ]
83 then
84 continue
85 fi 356 fi
86 ;; 357
87 portage_patch) 358 if type -p libtoolize &> /dev/null ; then
88 if [ "${doportage}" = "no" ] 359 ewarn "Cannot apply any patches, running libtoolize..."
89 then
90 continue
91 fi
92 ;;
93 esac
94
95 einfo "Applying libtool-${y/_patch/}.patch..."
96 eval ${y} $>${T}/libtool.foo
97 elif [ "${portage}" = "no" ]
98 then
99 libtoolize --copy --force 360 libtoolize --copy --force
361 fi
362 cd "${x}"
100 break 363 break
101 fi 364 fi
102 done 365 fi
366
367 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
368
369 touch "${x}/.elibtoolized"
103 done 370 done
104}
105 371
106# 372 cd "${start_dir}"
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} 373}
121 374
122# 375uclibctoolize() {
123# Various patches we want to apply. 376 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!"
124# 377 elibtoolize
125# Contains: portage_patch 378}
126# relink_patch
127# test_patch
128#
129portage_patch() {
130 379
131 local opts="" 380darwintoolize() {
381 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
382 elibtoolize
383}
132 384
133 if [ "${1}" = "--test" ] 385# char *VER_major(string)
134 then 386#
135 opts="--force --dry-run" 387# Return the Major (X of X.Y.Z) version
388#
389VER_major() {
390 [[ -z $1 ]] && return 1
391
392 local VER=$@
393 echo "${VER%%[^[:digit:]]*}"
394}
395
396# char *VER_minor(string)
397#
398# Return the Minor (Y of X.Y.Z) version
399#
400VER_minor() {
401 [[ -z $1 ]] && return 1
402
403 local VER=$@
404 VER=${VER#*.}
405 echo "${VER%%[^[:digit:]]*}"
406}
407
408# char *VER_micro(string)
409#
410# Return the Micro (Z of X.Y.Z) version.
411#
412VER_micro() {
413 [[ -z $1 ]] && return 1
414
415 local VER=$@
416 VER=${VER#*.*.}
417 echo "${VER%%[^[:digit:]]*}"
418}
419
420# int VER_to_int(string)
421#
422# Convert a string type version (2.4.0) to an int (132096)
423# for easy compairing or versions ...
424#
425VER_to_int() {
426 [[ -z $1 ]] && return 1
427
428 local VER_MAJOR=$(VER_major "$1")
429 local VER_MINOR=$(VER_minor "$1")
430 local VER_MICRO=$(VER_micro "$1")
431 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
432
433 # We make version 1.0.0 the minimum version we will handle as
434 # a sanity check ... if its less, we fail ...
435 if [[ ${VER_int} -ge 65536 ]] ; then
436 echo "${VER_int}"
437 return 0
136 fi 438 fi
137 439
138 patch ${opts} -p0 <<-"ENDPATCH" 440 echo 1
139 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002 441 return 1
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} 442}
196
197relink_patch() {
198
199 local opts=""
200 local retval=0
201
202 if [ "${1}" = "--test" ]
203 then
204 opts="--force --dry-run"
205 fi
206
207 patch ${opts} -p0 <<-"ENDPATCH"
208 --- ltmain.sh Sun Aug 12 18:08:05 2001
209 +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001
210 @@ -827,6 +827,7 @@
211 linker_flags=
212 dllsearchpath=
213 lib_search_path=`pwd`
214 + inst_prefix_dir=
215
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
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 ;;
362 esac
363 for pass in $passes; do
364 - if test $linkmode = prog; then
365 + if test "$linkmode" = prog; then
366 # Determine which files to process
367 case $pass in
368 dlopen)
369 @@ -1360,11 +1360,11 @@
370 found=no
371 case $deplib in
372 -l*)
373 - if test $linkmode = oldlib && test $linkmode = obj; then
374 + if test "$linkmode" = oldlib && test "$linkmode" = obj; then
375 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
376 continue
377 fi
378 - if test $pass = conv; then
379 + if test "$pass" = conv; then
380 deplibs="$deplib $deplibs"
381 continue
382 fi
383 @@ -1384,7 +1384,7 @@
384 finalize_deplibs="$deplib $finalize_deplibs"
385 else
386 deplibs="$deplib $deplibs"
387 - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
388 + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
389 fi
390 continue
391 fi
392 @@ -1393,16 +1393,16 @@
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
458
459 - if test $pass = conv; then
460 + if test "$pass" = conv; then
461 # Only check for convenience libraries
462 deplibs="$lib $deplibs"
463 if test -z "$libdir"; then
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
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}
642

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

  ViewVC Help
Powered by ViewVC 1.1.20