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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.96

  ViewVC Help
Powered by ViewVC 1.1.20