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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.102

  ViewVC Help
Powered by ViewVC 1.1.20