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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.91

  ViewVC Help
Powered by ViewVC 1.1.20