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

Diff of /eclass/libtool.eclass

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

Revision 1.5 Revision 1.69
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.69 2006/04/23 16:27:19 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.5 2002/06/10 18:25:04 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=
23 local mylist="" 129 local my_dirlist=
130 local elt_patches="portage relink max_cmd_len sed test tmp kde-fastinstall"
131 local start_dir=${PWD}
24 132
25 mylist="$(find_ltmain)" 133 my_dirlist=$(ELT_find_ltmain_sh)
26 # Only apply portage patch, and dont "libtoolize --copy --force" 134
27 # if all patches fail. 135 for x in "$@" ; do
28 for x in ${*} 136 case "${x}" in
29 do 137 "--portage")
30 if [ "${x}" = "--portage" ] 138 # Only apply portage patch, and don't
31 then 139 # 'libtoolize --copy --force' if all patches fail.
32 portage="yes" 140 do_portage="yes"
33 fi 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")
34 # Only patch the ltmain.sh in ${S} 161 # Only patch the ltmain.sh in ${S}
35 if [ "${x}" = "--shallow" ]
36 then
37 if [ -f ${S}/ltmain.sh ] 162 if [[ -f ${S}/ltmain.sh ]] ; then
38 then
39 mylist="${S}" 163 my_dirlist=${S}
40 else 164 else
41 mylist="" 165 my_dirlist=
42 fi 166 fi
43 else 167 ;;
44 mylist="$(find_ltmain)" 168 "--no-uclibc")
45 fi 169 do_uclibc="no"
170 ;;
171 *)
172 eerror "Invalid elibtoolize option: ${x}"
173 die "elibtoolize called with ${x} ??"
174 esac
46 done 175 done
47 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"
189 fi
190
48 for x in ${mylist} 191 for x in ${my_dirlist} ; do
49 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
50 cd ${x} 198 cd ${x}
51 einfo "Working directory: ${x}..." 199 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
52 dopatch="yes"
53 dotest="yes"
54 dorelink="yes"
55 doportage="yes"
56 200
57 for y in test_patch relink_patch portage_patch 201 for y in ${elt_patches} ; do
58 do 202 local ret=0
59 if ! eval ${y} --test $>${T}/libtool.foo 203
60 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
61 case ${y} in 281 case ${y} in
62 test_patch)
63 # non critical patch
64 dotest="no"
65 ;;
66 relink_patch) 282 "relink")
283 local version=$(ELT_libtool_version "${x}/ltmain.sh")
67 # critical patch, but could be applied 284 # Critical patch, but could be applied ...
285 # FIXME: Still need a patch for ltmain.sh > 1.4.0
68 if [ -z "$(grep -e "inst_prefix_dir" ltmain.sh)" ] && \ 286 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
69 [ "${portage}" = "no" ] 287 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
70 then 288 ewarn " Could not apply relink.patch!"
71 dopatch="no"
72 fi 289 fi
73 dorelink="no"
74 ;; 290 ;;
75 portage_patch) 291 "portage")
76 # critical patch 292 # Critical patch - for this one we abort, as it can really
293 # cause breakage without it applied!
77 if [ "${portage}" = "yes" ] 294 if [[ ${do_portage} == "yes" ]] ; then
78 then 295 # Stupid test to see if its already applied ...
296 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
79 echo 297 echo
80 eerror "Portage patch requested, but failed to apply!" 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!"
81 die 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"
82 fi 319 fi
83 dopatch="no" 320 ;;
84 doportage="no" 321 "uclibc-"*)
322 [[ ${CHOST} == *"-uclibc" ]] && \
323 ewarn " uClibc patch set '${y}' failed to apply!"
324 ;;
325 "fbsd-"*)
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!"
331 fi
332 fi
333 ;;
334 "darwin-"*)
335 useq ppc-macos && \
336 ewarn " Darwin patch set '${y}' failed to apply!"
337 ;;
338 "kde-fastinstall")
339 if [[ -n $(grep 'test "$mode" != relink && test "$fast_install" = no' ${x}/ltmain.sh) ]]; then
340 ewarn "Patch ${y} failed to apply. If you experience build failures, please report this."
341 fi
85 ;; 342 ;;
86 esac 343 esac
87 fi 344 fi
88 done 345 done
89 346
90 for y in test_patch relink_patch portage_patch 347 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
91 do 348 if [[ ${do_portage} == "no" && \
92 if [ "${dopatch}" = "yes" ] 349 ${do_reversedeps} == "no" && \
350 ${do_only_patches} == "no" && \
351 ${deptoremove} == "" ]]
93 then 352 then
94 case ${y} in 353 ewarn "Cannot apply any patches, please file a bug about this"
95 test_patch) 354 break
96 if [ "${dotest}" = "no" ] 355
97 then 356 # Sometimes ltmain.sh is in a subdirectory ...
98 continue 357 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
358 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
359 cd "${x}"/../
99 fi 360 fi
100 ;;
101 relink_patch)
102 if [ "${dorelink}" = "no" ]
103 then
104 continue
105 fi 361 fi
106 ;; 362
107 portage_patch) 363 if type -p libtoolize &> /dev/null ; then
108 if [ "${doportage}" = "no" ] 364 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 365 libtoolize --copy --force
366 fi
367 cd "${x}"
120 break 368 break
121 fi 369 fi
122 done 370 fi
371
372 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
373
374 touch "${x}/.elibtoolized"
123 done 375 done
124}
125 376
126# 377 cd "${start_dir}"
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} 378}
141 379
142# 380uclibctoolize() {
143# Various patches we want to apply. 381 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!"
144# 382 elibtoolize
145# Contains: portage_patch 383}
146# relink_patch
147# test_patch
148#
149portage_patch() {
150 384
151 local opts="" 385darwintoolize() {
386 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
387 elibtoolize
388}
152 389
153 if [ "${1}" = "--test" ] 390# char *VER_major(string)
154 then 391#
155 opts="--force --dry-run" 392# Return the Major (X of X.Y.Z) version
393#
394VER_major() {
395 [[ -z $1 ]] && return 1
396
397 local VER=$@
398 echo "${VER%%[^[:digit:]]*}"
399}
400
401# char *VER_minor(string)
402#
403# Return the Minor (Y of X.Y.Z) version
404#
405VER_minor() {
406 [[ -z $1 ]] && return 1
407
408 local VER=$@
409 VER=${VER#*.}
410 echo "${VER%%[^[:digit:]]*}"
411}
412
413# char *VER_micro(string)
414#
415# Return the Micro (Z of X.Y.Z) version.
416#
417VER_micro() {
418 [[ -z $1 ]] && return 1
419
420 local VER=$@
421 VER=${VER#*.*.}
422 echo "${VER%%[^[:digit:]]*}"
423}
424
425# int VER_to_int(string)
426#
427# Convert a string type version (2.4.0) to an int (132096)
428# for easy compairing or versions ...
429#
430VER_to_int() {
431 [[ -z $1 ]] && return 1
432
433 local VER_MAJOR=$(VER_major "$1")
434 local VER_MINOR=$(VER_minor "$1")
435 local VER_MICRO=$(VER_micro "$1")
436 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
437
438 # We make version 1.0.0 the minimum version we will handle as
439 # a sanity check ... if its less, we fail ...
440 if [[ ${VER_int} -ge 65536 ]] ; then
441 echo "${VER_int}"
442 return 0
156 fi 443 fi
157 444
158 patch ${opts} -p0 <<-"ENDPATCH" 445 echo 1
159 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002 446 return 1
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} 447}
216
217relink_patch() {
218
219 local opts=""
220 local retval=0
221
222 if [ "${1}" = "--test" ]
223 then
224 opts="--force --dry-run"
225 fi
226
227 patch ${opts} -p0 <<-"ENDPATCH"
228 --- ltmain.sh Sun Aug 12 18:08:05 2001
229 +++ ltmain-relinkable.sh Tue Aug 28 18:55:13 2001
230 @@ -827,6 +827,7 @@
231 linker_flags=
232 dllsearchpath=
233 lib_search_path=`pwd`
234 + inst_prefix_dir=
235
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
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 ;;
382 esac
383 for pass in $passes; do
384 - if test $linkmode = prog; then
385 + if test "$linkmode" = prog; then
386 # Determine which files to process
387 case $pass in
388 dlopen)
389 @@ -1360,11 +1360,11 @@
390 found=no
391 case $deplib in
392 -l*)
393 - if test $linkmode = oldlib && test $linkmode = obj; then
394 + if test "$linkmode" = oldlib && test "$linkmode" = obj; then
395 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
396 continue
397 fi
398 - if test $pass = conv; then
399 + if test "$pass" = conv; then
400 deplibs="$deplib $deplibs"
401 continue
402 fi
403 @@ -1384,7 +1384,7 @@
404 finalize_deplibs="$deplib $finalize_deplibs"
405 else
406 deplibs="$deplib $deplibs"
407 - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
408 + test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
409 fi
410 continue
411 fi
412 @@ -1393,16 +1393,16 @@
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
478
479 - if test $pass = conv; then
480 + if test "$pass" = conv; then
481 # Only check for convenience libraries
482 deplibs="$lib $deplibs"
483 if test -z "$libdir"; then
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
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}
662

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.69

  ViewVC Help
Powered by ViewVC 1.1.20