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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.97

  ViewVC Help
Powered by ViewVC 1.1.20