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

Diff of /eclass/libtool.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20