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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.93

  ViewVC Help
Powered by ViewVC 1.1.20