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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.62

  ViewVC Help
Powered by ViewVC 1.1.20