/[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.62
1#!/bin/bash 1# Copyright 1999-2005 Gentoo Foundation
2# Copyright 1999-2002 Gentoo Technologies, Inc.
3# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.62 2005/12/07 22:50:05 azarah Exp $
4#
4# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
5# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.7 2002/06/24 02:06:01 azarah Exp $ 6#
6# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
7# relink and portage patch 8# relink and portage patch among others
8ECLASS=libtool 9
9newdepend sys-devel/libtool 10
11# 2004.09.25 rac
12# i have verified that at least one package can use this eclass and
13# build properly even without libtool installed yet, probably using
14# the files in the distribution. eliminating this dependency fixes
15# bug 65209, which is a showstopper for people doing installs using
16# stageballs <3. if anybody decides to revert this, please attempt
17# to find an alternate way of resolving that bug at the same time.
10 18
11DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
12 20
21ELIBTOOL_VERSION="2.0.2"
22
23ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches"
24ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH=
26
27#
28# Returns all the directories containing ltmain.sh
29#
30ELT_find_ltmain_sh() {
31 local x=
32 local dirlist=
33
34 for x in $(find "${S}" -name 'ltmain.sh') ; do
35 dirlist="${dirlist} ${x%/*}"
36 done
37
38 echo "${dirlist}"
39}
40
41#
42# See if we can apply $2 on $1, and if so, do it
43#
44ELT_try_and_apply_patch() {
45 local ret=0
46 local file=$1
47 local patch=$2
48
49 # We only support patchlevel of 0 - why worry if its static patches?
50 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
52 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
53 &> "${T}/elibtool.log"
54 ret=$?
55 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
56 else
57 ret=1
58 fi
59
60 return "${ret}"
61}
62
63#
64# Get string version of ltmain.sh or ltconfig (passed as $1)
65#
66ELT_libtool_version() {
67 local ltmain_sh=$1
68 local version=
69
70 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
71 echo "${VERSION}")
72 [[ -z ${version} ]] && version="0"
73
74 echo "${version}"
75}
76
77#
78# Run through the patches in $2 and see if any
79# apply to $1 ...
80#
81ELT_walk_patches() {
82 local x=
83 local y=
84 local ret=1
85 local file=$1
86 local patch_set=$2
87 local patch_dir=
88 local rem_int_dep=$3
89 local version=
90 local ltmain_sh=$1
91
92 [[ ${file} == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH}
93 version=$(ELT_libtool_version "${ltmain_sh}")
94
95 if [[ -n ${patch_set} ]] ; then
96 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
97 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
98 else
99 return "${ret}"
100 fi
101
102 if [[ ${version} == "0" ]] ; then
103 eerror "Could not get VERSION for ${file##*/}!"
104 die "Could not get VERSION for ${file##*/}!"
105 fi
106
107 # Go through the patches in reverse order (large to small)
108 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
109 if [[ -n ${x} && -f ${x} ]] ; then
110 local ltver=$(VER_to_int "${version}")
111 local ptver=$(VER_to_int "${x##*/}")
112
113 # If libtool version smaller than patch version, skip patch.
114 [[ ${ltver} -lt ${ptver} ]] && continue
115 # For --remove-internal-dep ...
116 if [[ -n ${rem_int_dep} ]] ; then
117 # For replace @REM_INT_DEP@ with what was passed
118 # to --remove-internal-dep
119 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
120 "${T}/$$.rem_int_deps.patch"
121
122 x="${T}/$$.rem_int_deps.patch"
123 fi
124
125 if ELT_try_and_apply_patch "${file}" "${x}" ; then
126 ret=0
127 break
128 fi
129 fi
130 done
131 fi
132
133 return "${ret}"
134}
13 135
14elibtoolize() { 136elibtoolize() {
15
16 local x="" 137 local x=
17 local y="" 138 local y=
18 local dopatch="no"
19 local dotest="yes"
20 local dorelink="yes"
21 local dotmp="yes"
22 local doportage="yes"
23 local portage="no" 139 local do_portage="no"
140 local do_reversedeps="no"
141 local do_only_patches="no"
142 local do_uclibc="yes"
143 local deptoremove=
24 local mylist="" 144 local my_dirlist=
145 local elt_patches="portage relink max_cmd_len sed test tmp"
146 local start_dir=${PWD}
25 147
26 mylist="$(find_ltmain)" 148 my_dirlist=$(ELT_find_ltmain_sh)
27 # Only apply portage patch, and dont "libtoolize --copy --force" 149
28 # if all patches fail. 150 for x in "$@" ; do
29 for x in ${*} 151 case "${x}" in
30 do 152 "--portage")
31 if [ "${x}" = "--portage" ] 153 # Only apply portage patch, and don't
32 then 154 # 'libtoolize --copy --force' if all patches fail.
33 portage="yes" 155 do_portage="yes"
34 fi 156 ;;
157 "--reverse-deps")
158 # Apply the reverse-deps patch
159 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
160 do_reversedeps="yes"
161 elt_patches="${elt_patches} fix-relink"
162 ;;
163 "--patch-only")
164 # Do not run libtoolize if none of the patches apply ..
165 do_only_patches="yes"
166 ;;
167 "^--remove-internal-dep="*)
168 # We will replace @REM_INT_DEP@ with what is needed
169 # in ELT_walk_patches() ...
170 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
171
172 # Add the patch for this ...
173 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
174 ;;
175 "--shallow")
35 # Only patch the ltmain.sh in ${S} 176 # Only patch the ltmain.sh in ${S}
36 if [ "${x}" = "--shallow" ]
37 then
38 if [ -f ${S}/ltmain.sh ] 177 if [[ -f ${S}/ltmain.sh ]] ; then
39 then
40 mylist="${S}" 178 my_dirlist=${S}
41 else 179 else
42 mylist="" 180 my_dirlist=
43 fi 181 fi
44 else 182 ;;
45 mylist="$(find_ltmain)" 183 "--no-uclibc")
46 fi 184 do_uclibc="no"
185 ;;
186 *)
187 eerror "Invalid elibtoolize option: ${x}"
188 die "elibtoolize called with ${x} ??"
189 esac
47 done 190 done
48 191
192 [[ ${do_uclibc} == "yes" ]] && \
193 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
194
195 [[ ${CHOST} == *"-freebsd"* ]] && \
196 elt_patches="${elt_patches} fbsd-conf"
197
198 if useq ppc-macos ; then
199 local opts
200 [[ -f Makefile.am ]] && opts="--automake"
201 glibtoolize --copy --force ${opts}
202
203 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
204 fi
205
49 for x in ${mylist} 206 for x in ${my_dirlist} ; do
50 do 207 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
208 export ELT_APPLIED_PATCHES=
209 export ELT_LTMAIN_SH="${x}/ltmain.sh"
210
211 [[ -f ${x}/.elibtoolized ]] && continue
212
51 cd ${x} 213 cd ${x}
52 einfo "Working directory: ${x}..." 214 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
53 dopatch="yes"
54 dotest="yes"
55 dorelink="yes"
56 dotmp="yes"
57 doportage="yes"
58 215
59 for y in test_patch relink_patch tmp_patch portage_patch 216 for y in ${elt_patches} ; do
60 do 217 local ret=0
61 if ! eval ${y} --test $>${T}/libtool.foo 218
62 then 219 case "${y}" in
220 "rem-int-dep")
221 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
222 ret=$?
223 ;;
224 "fix-relink")
225 # Do not apply if we do not have the relink patch applied ...
226 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
227 ELT_walk_patches "${x}/ltmain.sh" "${y}"
228 ret=$?
229 fi
230 ;;
231 "max_cmd_len")
232 # Do not apply if $max_cmd_len is not used ...
233 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
234 ELT_walk_patches "${x}/ltmain.sh" "${y}"
235 ret=$?
236 fi
237 ;;
238 "uclibc-conf")
239 if [[ -e ${x}/configure && \
240 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
241 ELT_walk_patches "${x}/configure" "${y}"
242 ret=$?
243 # ltmain.sh and co might be in a subdirectory ...
244 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
245 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
246 ELT_walk_patches "${x}/../configure" "${y}"
247 ret=$?
248 fi
249 ;;
250 "uclibc-ltconf")
251 # Newer libtoolize clears ltconfig, as not used anymore
252 if [[ -s ${x}/ltconfig ]] ; then
253 ELT_walk_patches "${x}/ltconfig" "${y}"
254 ret=$?
255 fi
256 ;;
257 "fbsd-conf")
258 if [[ -e ${x}/configure && \
259 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
260 ELT_walk_patches "${x}/configure" "${y}"
261 ret=$?
262 # ltmain.sh and co might be in a subdirectory ...
263 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
264 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
265 ELT_walk_patches "${x}/../configure" "${y}"
266 ret=$?
267 fi
268 ;;
269 "darwin-ltconf")
270 # Newer libtoolize clears ltconfig, as not used anymore
271 if [[ -s ${x}/ltconfig ]] ; then
272 ELT_walk_patches "${x}/ltconfig" "${y}"
273 ret=$?
274 fi
275 ;;
276 *)
277 ELT_walk_patches "${x}/ltmain.sh" "${y}"
278 ret=$?
279 ;;
280 esac
281
282 if [[ ${ret} -ne 0 ]] ; then
63 case ${y} in 283 case ${y} in
64 test_patch) 284 "relink")
65 # non critical patch 285 local version=$(ELT_libtool_version "${x}/ltmain.sh")
66 dotest="no" 286 # Critical patch, but could be applied ...
287 # FIXME: Still need a patch for ltmain.sh > 1.4.0
288 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
289 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
290 ewarn " Could not apply relink.patch!"
291 fi
67 ;; 292 ;;
68 relink_patch) 293 "portage")
69 # critical patch, but could be applied 294 # Critical patch - for this one we abort, as it can really
70 if [ -z "$(grep -e "inst_prefix_dir" ltmain.sh)" ] && \ 295 # cause breakage without it applied!
71 [ "${portage}" = "no" ] 296 if [[ ${do_portage} == "yes" ]] ; then
72 then 297 # Stupid test to see if its already applied ...
73 dopatch="no" 298 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
299 echo
300 eerror "Portage patch requested, but failed to apply!"
301 die "Portage patch requested, but failed to apply!"
302 fi
303 else
304 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
305 # ewarn " Portage patch seems to be already applied."
306 # ewarn " Please verify that it is not needed."
307 :
308 else
309 local version=$( \
310 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
311 echo "${VERSION}")
312
313 echo
314 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
315 die "Portage patch failed to apply!"
316 fi
317 # We do not want to run libtoolize ...
318 ELT_APPLIED_PATCHES="portage"
74 fi 319 fi
75 dorelink="no"
76 ;; 320 ;;
77 tmp_patch) 321 "uclibc-"*)
78 # non critical patch 322 [[ ${CHOST} == *"-uclibc" ]] && \
79 dotmp="no" 323 ewarn " uClibc patch set '${y}' failed to apply!"
80 ;; 324 ;;
81 portage_patch) 325 "fbsd-"*)
82 # critical patch 326 if [[ ${CHOST} == *"-freebsd"* ]] ; then
83 if [ "${portage}" = "yes" ] 327 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then
84 then 328 eerror " FreeBSD patch set '${y}' failed to apply!"
85 echo 329 die "FreeBSD patch set '${y}' failed to apply!"
86 eerror "Portage patch requested, but failed to apply!"
87 die 330 fi
88 fi 331 fi
89 dopatch="no" 332 ;;
90 doportage="no" 333 "darwin-"*)
334 useq ppc-macos && \
335 ewarn " Darwin patch set '${y}' failed to apply!"
91 ;; 336 ;;
92 esac 337 esac
93 fi 338 fi
94 done 339 done
95 340
96 for y in test_patch relink_patch tmp_patch portage_patch 341 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
97 do 342 if [[ ${do_portage} == "no" && \
98 if [ "${dopatch}" = "yes" ] 343 ${do_reversedeps} == "no" && \
344 ${do_only_patches} == "no" && \
345 ${deptoremove} == "" ]]
99 then 346 then
100 case ${y} in 347 ewarn "Cannot apply any patches, please file a bug about this"
101 test_patch) 348 break
102 if [ "${dotest}" = "no" ] 349
103 then 350 # Sometimes ltmain.sh is in a subdirectory ...
104 continue 351 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
352 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
353 cd "${x}"/../
105 fi 354 fi
106 ;;
107 relink_patch)
108 if [ "${dorelink}" = "no" ]
109 then
110 continue
111 fi 355 fi
112 ;; 356
113 tmp_patch) 357 if type -p libtoolize &> /dev/null ; then
114 if [ "${dotmp}" = "no" ] 358 ewarn "Cannot apply any patches, running libtoolize..."
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 359 libtoolize --copy --force
360 fi
361 cd "${x}"
132 break 362 break
133 fi 363 fi
134 done 364 fi
365
366 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
367
368 touch "${x}/.elibtoolized"
135 done 369 done
136 370
137 if [ -f libtool ] 371 cd "${start_dir}"
138 then 372}
139 rm -f libtool 373
374uclibctoolize() {
375 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!"
376 elibtoolize
377}
378
379darwintoolize() {
380 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
381 elibtoolize
382}
383
384# char *VER_major(string)
385#
386# Return the Major (X of X.Y.Z) version
387#
388VER_major() {
389 [[ -z $1 ]] && return 1
390
391 local VER=$@
392 echo "${VER%%[^[:digit:]]*}"
393}
394
395# char *VER_minor(string)
396#
397# Return the Minor (Y of X.Y.Z) version
398#
399VER_minor() {
400 [[ -z $1 ]] && return 1
401
402 local VER=$@
403 VER=${VER#*.}
404 echo "${VER%%[^[:digit:]]*}"
405}
406
407# char *VER_micro(string)
408#
409# Return the Micro (Z of X.Y.Z) version.
410#
411VER_micro() {
412 [[ -z $1 ]] && return 1
413
414 local VER=$@
415 VER=${VER#*.*.}
416 echo "${VER%%[^[:digit:]]*}"
417}
418
419# int VER_to_int(string)
420#
421# Convert a string type version (2.4.0) to an int (132096)
422# for easy compairing or versions ...
423#
424VER_to_int() {
425 [[ -z $1 ]] && return 1
426
427 local VER_MAJOR=$(VER_major "$1")
428 local VER_MINOR=$(VER_minor "$1")
429 local VER_MICRO=$(VER_micro "$1")
430 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
431
432 # We make version 1.0.0 the minimum version we will handle as
433 # a sanity check ... if its less, we fail ...
434 if [[ ${VER_int} -ge 65536 ]] ; then
435 echo "${VER_int}"
436 return 0
140 fi 437 fi
141 438
142 # We need to change the pwd back to $S, as we may be called in 439 echo 1
143 # src_compile() 440 return 1
144 cd ${S}
145} 441}
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.62

  ViewVC Help
Powered by ViewVC 1.1.20