/[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.87
1#!/bin/bash 1# Copyright 1999-2007 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.5 2002/06/10 18:25:04 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.87 2010/04/14 18:14:45 vapier Exp $
4#
5# Maintainer: base-system@gentoo.org
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# Note, this eclass does not require libtool as it only applies patches to
11# generated libtool files. We do not run the libtoolize program because that
12# requires a regeneration of the main autotool files in order to work properly.
10 13
11DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
12 15
16ELIBTOOL_VERSION="2.0.2"
13 17
14elibtoolize() { 18inherit toolchain-funcs
15 19
20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
21ELT_APPLIED_PATCHES=
22ELT_LTMAIN_SH=
23
24#
25# Returns all the directories containing ltmain.sh
26#
27ELT_find_ltmain_sh() {
16 local x="" 28 local x=
17 local y=""
18 local dopatch="no"
19 local dotest="yes"
20 local dorelink="yes"
21 local doportage="yes"
22 local portage="no"
23 local mylist="" 29 local dirlist=
24 30
25 mylist="$(find_ltmain)" 31 for x in $(find "${S}" -name 'ltmain.sh') ; do
26 # Only apply portage patch, and dont "libtoolize --copy --force" 32 dirlist="${dirlist} ${x%/*}"
27 # if all patches fail.
28 for x in ${*}
29 do 33 done
30 if [ "${x}" = "--portage" ] 34
31 then 35 echo "${dirlist}"
32 portage="yes" 36}
37
38#
39# See if we can apply $2 on $1, and if so, do it
40#
41ELT_try_and_apply_patch() {
42 local ret=0
43 local file=$1
44 local patch=$2
45
46 # We only support patchlevel of 0 - why worry if its static patches?
47 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
49 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
50 &> "${T}/elibtool.log"
51 ret=$?
52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
53 else
54 ret=1
55 fi
56
57 return "${ret}"
58}
59
60#
61# Get string version of ltmain.sh or ltconfig (passed as $1)
62#
63ELT_libtool_version() {
64 local ltmain_sh=$1
65 local version=
66
67 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
68 echo "${VERSION}")
69 [[ -z ${version} ]] && version="0"
70
71 echo "${version}"
72}
73
74#
75# Run through the patches in $2 and see if any
76# apply to $1 ...
77#
78ELT_walk_patches() {
79 local patch
80 local ret=1
81 local file=$1
82 local patch_set=$2
83 local patch_dir="${ELT_PATCH_DIR}/${patch_set}"
84 local rem_int_dep=$3
85
86 [[ -z ${patch_set} ]] && return 1
87 [[ ! -d ${patch_dir} ]] && return 1
88
89 pushd "${ELT_PATCH_DIR}" >/dev/null
90
91 # Go through the patches in reverse order (newer version to older)
92 for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
93 # For --remove-internal-dep ...
94 if [[ -n ${rem_int_dep} ]] ; then
95 # For replace @REM_INT_DEP@ with what was passed
96 # to --remove-internal-dep
97 local tmp="${T}/$$.rem_int_deps.patch"
98 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" "${patch}" > "${tmp}"
99 patch=${tmp}
33 fi 100 fi
34 # Only patch the ltmain.sh in ${S} 101
35 if [ "${x}" = "--shallow" ] 102 if ELT_try_and_apply_patch "${file}" "${patch}" ; then
36 then 103 # Break to unwind w/popd rather than return directly
37 if [ -f ${S}/ltmain.sh ] 104 ret=0
38 then 105 break
39 mylist="${S}"
40 else
41 mylist=""
42 fi
43 else
44 mylist="$(find_ltmain)"
45 fi 106 fi
46 done 107 done
47 108
109 popd >/dev/null
110 return ${ret}
111}
112
113elibtoolize() {
114 local x=
115 local y=
116 local do_portage="no"
117 local do_reversedeps="no"
118 local do_only_patches="no"
119 local do_uclibc="yes"
120 local deptoremove=
121 local my_dirlist=
122 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
123 local start_dir=${PWD}
124
125 my_dirlist=$(ELT_find_ltmain_sh)
126
127 for x in "$@" ; do
128 case "${x}" in
129 "--portage")
130 # Only apply portage patch, and don't
131 # 'libtoolize --copy --force' if all patches fail.
132 do_portage="yes"
133 ;;
134 "--reverse-deps")
135 # Apply the reverse-deps patch
136 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
137 do_reversedeps="yes"
138 elt_patches="${elt_patches} fix-relink"
139 ;;
140 "--patch-only")
141 # Do not run libtoolize if none of the patches apply ..
142 do_only_patches="yes"
143 ;;
144 "^--remove-internal-dep="*)
145 # We will replace @REM_INT_DEP@ with what is needed
146 # in ELT_walk_patches() ...
147 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
148
149 # Add the patch for this ...
150 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
151 ;;
152 "--shallow")
153 # Only patch the ltmain.sh in ${S}
154 if [[ -f ${S}/ltmain.sh ]] ; then
155 my_dirlist=${S}
156 else
157 my_dirlist=
158 fi
159 ;;
160 "--no-uclibc")
161 do_uclibc="no"
162 ;;
163 *)
164 eerror "Invalid elibtoolize option: ${x}"
165 die "elibtoolize called with ${x} ??"
166 esac
167 done
168
169 [[ ${do_uclibc} == "yes" ]] && \
170 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
171
172 case "${CHOST}" in
173 *-aix*)
174 elt_patches="${elt_patches} hardcode aixrtl"
175 ;;
176 *-darwin*)
177 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf"
178 ;;
179 *-freebsd*)
180 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
181 ;;
182 *-hpux*)
183 elt_patches="${elt_patches} hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc"
184 ;;
185 *-irix*)
186 elt_patches="${elt_patches} irix-ltmain"
187 ;;
188 *-mint*)
189 elt_patches="${elt_patches} mint-conf"
190 ;;
191 esac
192
48 for x in ${mylist} 193 for x in ${my_dirlist} ; do
49 do 194 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
195 export ELT_APPLIED_PATCHES=
196 export ELT_LTMAIN_SH="${x}/ltmain.sh"
197
198 [[ -f ${x}/.elibtoolized ]] && continue
199
50 cd ${x} 200 cd ${x}
51 einfo "Working directory: ${x}..." 201 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
52 dopatch="yes"
53 dotest="yes"
54 dorelink="yes"
55 doportage="yes"
56 202
57 for y in test_patch relink_patch portage_patch 203 for y in ${elt_patches} ; do
58 do 204 local ret=0
59 if ! eval ${y} --test $>${T}/libtool.foo 205
60 then 206 case "${y}" in
207 "portage")
208 # Stupid test to see if its already applied ...
209 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
210 ELT_walk_patches "${x}/ltmain.sh" "${y}"
211 ret=$?
212 fi
213 ;;
214 "rem-int-dep")
215 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
216 ret=$?
217 ;;
218 "fix-relink")
219 # Do not apply if we do not have the relink patch applied ...
220 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
221 ELT_walk_patches "${x}/ltmain.sh" "${y}"
222 ret=$?
223 fi
224 ;;
225 "max_cmd_len")
226 # Do not apply if $max_cmd_len is not used ...
227 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
228 ELT_walk_patches "${x}/ltmain.sh" "${y}"
229 ret=$?
230 fi
231 ;;
232 "as-needed")
233 ELT_walk_patches "${x}/ltmain.sh" "${y}"
234 ret=$?
235 ;;
236 "uclibc-conf")
237 if [[ -e ${x}/configure && \
238 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
239 ELT_walk_patches "${x}/configure" "${y}"
240 ret=$?
241 # ltmain.sh and co might be in a subdirectory ...
242 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
243 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
244 ELT_walk_patches "${x}/../configure" "${y}"
245 ret=$?
246 fi
247 ;;
248 "uclibc-ltconf")
249 # Newer libtoolize clears ltconfig, as not used anymore
250 if [[ -s ${x}/ltconfig ]] ; then
251 ELT_walk_patches "${x}/ltconfig" "${y}"
252 ret=$?
253 fi
254 ;;
255 "fbsd-conf")
256 if [[ -e ${x}/configure && \
257 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
258 ELT_walk_patches "${x}/configure" "${y}"
259 ret=$?
260 # ltmain.sh and co might be in a subdirectory ...
261 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
262 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
263 ELT_walk_patches "${x}/../configure" "${y}"
264 ret=$?
265 fi
266 ;;
267 "fbsd-ltconf")
268 if [[ -s ${x}/ltconfig ]] ; then
269 ELT_walk_patches "${x}/ltconfig" "${y}"
270 ret=$?
271 fi
272 ;;
273 "darwin-conf")
274 if [[ -e ${x}/configure && \
275 -n $(grep '&& echo \.so ||' "${x}/configure") ]] ; then
276 ELT_walk_patches "${x}/configure" "${y}"
277 ret=$?
278 # ltmain.sh and co might be in a subdirectory ...
279 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
280 -n $(grep '&& echo \.so ||' "${x}/../configure") ]] ; then
281 ELT_walk_patches "${x}/../configure" "${y}"
282 ret=$?
283 fi
284 ;;
285 "darwin-ltconf")
286 # Newer libtoolize clears ltconfig, as not used anymore
287 if [[ -s ${x}/ltconfig ]] ; then
288 ELT_walk_patches "${x}/ltconfig" "${y}"
289 ret=$?
290 fi
291 ;;
292 "darwin-ltmain")
293 # special case to avoid false positives (failing to apply
294 # ltmain.sh path message), newer libtools have this patch
295 # built in, so not much to patch around then
296 if [[ -e ${x}/ltmain.sh && \
297 -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then
298 ELT_walk_patches "${x}/ltmain.sh" "${y}"
299 ret=$?
300 fi
301 ;;
302 "aixrtl" | "hpux-conf")
303 ret=1
304 local subret=0
305 # apply multiple patches as often as they match
306 while [[ $subret -eq 0 ]]; do
307 subret=1
308 if [[ -e ${x}/configure ]]; then
309 ELT_walk_patches "${x}/configure" "${y}"
310 subret=$?
311 # ltmain.sh and co might be in a subdirectory ...
312 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
313 ELT_walk_patches "${x}/../configure" "${y}"
314 subret=$?
315 fi
316 if [[ $subret -eq 0 ]]; then
317 # have at least one patch succeeded.
318 ret=0
319 fi
320 done
321 ;;
322 "mint-conf")
323 ret=1
324 local subret=1
325 if [[ -e ${x}/configure ]]; then
326 ELT_walk_patches "${x}/configure" "${y}"
327 subret=$?
328 # ltmain.sh and co might be in a subdirectory ...
329 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
330 ELT_walk_patches "${x}/../configure" "${y}"
331 subret=$?
332 fi
333 if [[ $subret -eq 0 ]]; then
334 # have at least one patch succeeded.
335 ret=0
336 fi
337 ;;
338 "install-sh")
339 ELT_walk_patches "${x}/install-sh" "${y}"
340 ret=$?
341 ;;
342 "cross")
343 if tc-is-cross-compiler ; then
344 ELT_walk_patches "${x}/ltmain.sh" "${y}"
345 ret=$?
346 fi
347 ;;
348 *)
349 ELT_walk_patches "${x}/ltmain.sh" "${y}"
350 ret=$?
351 ;;
352 esac
353
354 if [[ ${ret} -ne 0 ]] ; then
61 case ${y} in 355 case ${y} in
62 test_patch) 356 "relink")
63 # non critical patch 357 local version=$(ELT_libtool_version "${x}/ltmain.sh")
64 dotest="no" 358 # Critical patch, but could be applied ...
359 # FIXME: Still need a patch for ltmain.sh > 1.4.0
360 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
361 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
362 ewarn " Could not apply relink.patch!"
363 fi
65 ;; 364 ;;
66 relink_patch) 365 "portage")
67 # critical patch, but could be applied 366 # Critical patch - for this one we abort, as it can really
68 if [ -z "$(grep -e "inst_prefix_dir" ltmain.sh)" ] && \ 367 # cause breakage without it applied!
69 [ "${portage}" = "no" ] 368 if [[ ${do_portage} == "yes" ]] ; then
70 then 369 # Stupid test to see if its already applied ...
71 dopatch="no" 370 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
371 echo
372 eerror "Portage patch requested, but failed to apply!"
373 eerror "Please bug azarah or vapier to add proper patch."
374 die "Portage patch requested, but failed to apply!"
375 fi
376 else
377 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
378 # ewarn " Portage patch seems to be already applied."
379 # ewarn " Please verify that it is not needed."
380 :
381 else
382 local version=$( \
383 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
384 echo "${VERSION}")
385
386 echo
387 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
388 eerror "Please bug azarah or vapier to add proper patch."
389 die "Portage patch failed to apply!"
390 fi
391 # We do not want to run libtoolize ...
392 ELT_APPLIED_PATCHES="portage"
72 fi 393 fi
73 dorelink="no"
74 ;; 394 ;;
75 portage_patch) 395 "uclibc-"*)
76 # critical patch 396 [[ ${CHOST} == *"-uclibc" ]] && \
77 if [ "${portage}" = "yes" ] 397 ewarn " uClibc patch set '${y}' failed to apply!"
78 then 398 ;;
79 echo 399 "fbsd-"*)
80 eerror "Portage patch requested, but failed to apply!" 400 if [[ ${CHOST} == *"-freebsd"* ]] ; then
401 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
402 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
403 eerror " FreeBSD patch set '${y}' failed to apply!"
404 die "FreeBSD patch set '${y}' failed to apply!"
81 die 405 fi
82 fi 406 fi
83 dopatch="no" 407 ;;
84 doportage="no" 408 "darwin-"*)
409 [[ ${CHOST} == *"-darwin"* ]] && \
410 ewarn " Darwin patch set '${y}' failed to apply!"
85 ;; 411 ;;
86 esac 412 esac
87 fi 413 fi
88 done 414 done
89 415
90 for y in test_patch relink_patch portage_patch 416 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
91 do 417 if [[ ${do_portage} == "no" && \
92 if [ "${dopatch}" = "yes" ] 418 ${do_reversedeps} == "no" && \
419 ${do_only_patches} == "no" && \
420 ${deptoremove} == "" ]]
93 then 421 then
94 case ${y} in 422 ewarn "Cannot apply any patches, please file a bug about this"
95 test_patch) 423 die
96 if [ "${dotest}" = "no" ]
97 then
98 continue
99 fi
100 ;;
101 relink_patch)
102 if [ "${dorelink}" = "no" ]
103 then
104 continue
105 fi
106 ;;
107 portage_patch)
108 if [ "${doportage}" = "no" ]
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
120 break
121 fi 424 fi
122 done 425 fi
426
427 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
428
429 >> "${x}/.elibtoolized"
123 done 430 done
124}
125 431
126# 432 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} 433}
141 434
142# 435uclibctoolize() {
143# Various patches we want to apply. 436 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
144# 437 elibtoolize
145# Contains: portage_patch 438}
146# relink_patch
147# test_patch
148#
149portage_patch() {
150 439
151 local opts="" 440darwintoolize() {
441 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
442 elibtoolize
443}
152 444
153 if [ "${1}" = "--test" ] 445# char *VER_major(string)
154 then 446#
155 opts="--force --dry-run" 447# Return the Major (X of X.Y.Z) version
448#
449VER_major() {
450 [[ -z $1 ]] && return 1
451
452 local VER=$@
453 echo "${VER%%[^[:digit:]]*}"
454}
455
456# char *VER_minor(string)
457#
458# Return the Minor (Y of X.Y.Z) version
459#
460VER_minor() {
461 [[ -z $1 ]] && return 1
462
463 local VER=$@
464 VER=${VER#*.}
465 echo "${VER%%[^[:digit:]]*}"
466}
467
468# char *VER_micro(string)
469#
470# Return the Micro (Z of X.Y.Z) version.
471#
472VER_micro() {
473 [[ -z $1 ]] && return 1
474
475 local VER=$@
476 VER=${VER#*.*.}
477 echo "${VER%%[^[:digit:]]*}"
478}
479
480# int VER_to_int(string)
481#
482# Convert a string type version (2.4.0) to an int (132096)
483# for easy compairing or versions ...
484#
485VER_to_int() {
486 [[ -z $1 ]] && return 1
487
488 local VER_MAJOR=$(VER_major "$1")
489 local VER_MINOR=$(VER_minor "$1")
490 local VER_MICRO=$(VER_micro "$1")
491 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
492
493 # We make version 1.0.0 the minimum version we will handle as
494 # a sanity check ... if its less, we fail ...
495 if [[ ${VER_int} -ge 65536 ]] ; then
496 echo "${VER_int}"
497 return 0
156 fi 498 fi
157 499
158 patch ${opts} -p0 <<-"ENDPATCH" 500 echo 1
159 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002 501 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} 502}
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.87

  ViewVC Help
Powered by ViewVC 1.1.20