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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.112

  ViewVC Help
Powered by ViewVC 1.1.20