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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20