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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.7  
changed lines
  Added in v.1.92

  ViewVC Help
Powered by ViewVC 1.1.20