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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.95

  ViewVC Help
Powered by ViewVC 1.1.20