1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
|
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.96 2011/11/18 17:32:14 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
# base-system@gentoo.org
# @BLURB: quickly update bundled libtool code
# @DESCRIPTION:
# This eclass patches ltmain.sh distributed with libtoolized packages with the
# relink and portage patch among others
#
# Note, this eclass does not require libtool as it only applies patches to
# generated libtool files. We do not run the libtoolize program because that
# requires a regeneration of the main autotool files in order to work properly.
# If an overlay has eclass overrides, but doesn't actually override the
# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's
# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So
# add a check to locate the ELT-patches/ regardless of what's going on.
ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*}
elt_patch_dir() {
local d="${ECLASSDIR}/ELT-patches"
if [[ ! -d ${d} ]] ; then
d="${ECLASSDIR_LOCAL}/ELT-patches"
fi
echo "${d}"
}
DESCRIPTION="Based on the ${ECLASS} eclass"
inherit multilib toolchain-funcs
#
# See if we can apply $2 on $1, and if so, do it
#
ELT_try_and_apply_patch() {
local ret=0
local file=$1
local patch=$2
local src=$3
local disp="${src} patch"
local log="${T}/elibtool.log"
if [[ -z ${__ELT_NOTED_TMP} ]] ; then
__ELT_NOTED_TMP=true
printf 'temp patch: %s\n' "${patch}" > "${log}"
fi
printf '\nTrying %s\n' "${disp}" >> "${log}"
# We only support patchlevel of 0 - why worry if its static patches?
if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then
einfo " Applying ${disp} ..."
patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1
ret=$?
export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${src}"
else
ret=1
fi
return "${ret}"
}
#
# Get string version of ltmain.sh or ltconfig (passed as $1)
#
ELT_libtool_version() {
(
unset VERSION
eval $(grep -e '^[[:space:]]*VERSION=' "$1")
echo "${VERSION:-0}"
)
}
#
# Run through the patches in $2 and see if any
# apply to $1 ...
#
ELT_walk_patches() {
local patch tmp
local ret=1
local file=$1
local patch_set=$2
local patch_dir="$(elt_patch_dir)/${patch_set}"
local rem_int_dep=$3
[[ -z ${patch_set} ]] && return 1
[[ ! -d ${patch_dir} ]] && return 1
# Allow patches to use @GENTOO_LIBDIR@ replacements
local sed_args=( -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" )
if [[ -n ${rem_int_dep} ]] ; then
# replace @REM_INT_DEP@ with what was passed
# to --remove-internal-dep
sed_args+=( -e "s|@REM_INT_DEP@|${rem_int_dep}|g" )
fi
pushd "$(elt_patch_dir)" >/dev/null || die
# Go through the patches in reverse order (newer version to older)
for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
tmp="${T}/libtool-elt.patch"
sed "${sed_args[@]}" "${patch}" > "${tmp}" || die
if ELT_try_and_apply_patch "${file}" "${tmp}" "${patch}" ; then
# Break to unwind w/popd rather than return directly
ret=0
break
fi
done
popd >/dev/null
return ${ret}
}
# @FUNCTION: elibtoolize
# @USAGE: [dirs] [--portage] [--reverse-deps] [--patch-only] [--remove-internal-dep=xxx] [--shallow] [--no-uclibc]
# @DESCRIPTION:
# Apply a smorgasbord of patches to bundled libtool files. This function
# should always be safe to run. If no directories are specified, then
# ${S} will be searched for appropriate files.
#
# If the --shallow option is used, then only ${S}/ltmain.sh will be patched.
#
# The other options should be avoided in general unless you know what's going on.
elibtoolize() {
local x
local do_portage="no"
local do_reversedeps="no"
local do_only_patches="no"
local do_uclibc="yes"
local deptoremove=
local do_shallow="no"
local force="false"
local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
for x in "$@" ; do
case ${x} in
--portage)
# Only apply portage patch, and don't
# 'libtoolize --copy --force' if all patches fail.
do_portage="yes"
;;
--reverse-deps)
# Apply the reverse-deps patch
# http://bugzilla.gnome.org/show_bug.cgi?id=75635
do_reversedeps="yes"
elt_patches+=" fix-relink"
;;
--patch-only)
# Do not run libtoolize if none of the patches apply ..
do_only_patches="yes"
;;
--remove-internal-dep=*)
# We will replace @REM_INT_DEP@ with what is needed
# in ELT_walk_patches() ...
deptoremove=${x#--remove-internal-dep=}
# Add the patch for this ...
[[ -n ${deptoremove} ]] && elt_patches+=" rem-int-dep"
;;
--shallow)
# Only patch the ltmain.sh in ${S}
do_shallow="yes"
;;
--no-uclibc)
do_uclibc="no"
;;
--force)
force="true"
;;
*)
eerror "Invalid elibtoolize option: ${x}"
die "elibtoolize called with ${x} ??"
esac
done
[[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"
case ${CHOST} in
*-aix*) elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277
*-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;;
*-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;;
*-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;;
*-irix*) elt_patches+=" irix-ltmain" ;;
*-mint*) elt_patches+=" mint-conf" ;;
esac
if $(tc-getLD) --version 2>&1 | grep -qs 'GNU gold'; then
elt_patches+=" gold-conf"
fi
# Reuse "$@" for dirs to patch
set --
if [[ ${do_shallow} == "yes" ]] ; then
[[ -f ${S}/ltmain.sh ]] && set -- "${S}"
else
set -- $(find "${S}" -name ltmain.sh -printf '%h ')
fi
local d p
for d in "$@" ; do
export ELT_APPLIED_PATCHES=
if [[ -f ${d}/.elibtoolized ]] ; then
${force} || continue
fi
einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
if [[ -f ${d}/.elibtoolized ]] ; then
ewarn " We've already been run in this tree; you should"
ewarn " avoid this if possible (perhaps by filing a bug)"
fi
for p in ${elt_patches} ; do
local ret=0
case ${p} in
portage)
# Stupid test to see if its already applied ...
if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
rem-int-dep)
ELT_walk_patches "${d}/ltmain.sh" "${p}" "${deptoremove}"
ret=$?
;;
fix-relink)
# Do not apply if we do not have the relink patch applied ...
if grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" ; then
ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
max_cmd_len)
# Do not apply if $max_cmd_len is not used ...
if grep -qs 'max_cmd_len' "${d}/ltmain.sh" ; then
ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
as-needed)
ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
;;
uclibc-conf)
if grep -qs 'Transform linux' "${d}/configure" ; then
ELT_walk_patches "${d}/configure" "${p}"
ret=$?
# ltmain.sh and co might be in a subdirectory ...
elif [[ ! -e ${d}/configure ]] && \
grep -qs 'Transform linux' "${d}/../configure" ; then
ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
;;
uclibc-ltconf)
# Newer libtoolize clears ltconfig, as not used anymore
if [[ -s ${d}/ltconfig ]] ; then
ELT_walk_patches "${d}/ltconfig" "${p}"
ret=$?
fi
;;
fbsd-conf)
if grep -qs 'version_type=freebsd-' "${d}/configure" ; then
ELT_walk_patches "${d}/configure" "${p}"
ret=$?
# ltmain.sh and co might be in a subdirectory ...
elif [[ ! -e ${d}/configure ]] && \
grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
;;
fbsd-ltconf)
if [[ -s ${d}/ltconfig ]] ; then
ELT_walk_patches "${d}/ltconfig" "${p}"
ret=$?
fi
;;
darwin-conf)
if grep -qs '&& echo \.so ||' "${d}/configure" ; then
ELT_walk_patches "${d}/configure" "${p}"
ret=$?
# ltmain.sh and co might be in a subdirectory ...
elif [[ ! -e ${d}/configure ]] && \
grep -qs '&& echo \.so ||' "${d}/../configure" ; then
ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
;;
darwin-ltconf)
# Newer libtoolize clears ltconfig, as not used anymore
if [[ -s ${d}/ltconfig ]] ; then
ELT_walk_patches "${d}/ltconfig" "${p}"
ret=$?
fi
;;
darwin-ltmain)
# special case to avoid false positives (failing to apply
# ltmain.sh path message), newer libtools have this patch
# built in, so not much to patch around then
if [[ -e ${d}/ltmain.sh ]] && \
! grep -qs 'verstring="-compatibility_version' "${d}/ltmain.sh" ; then
ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
aixrtl|hpux-conf)
ret=1
local subret=0
# apply multiple patches as often as they match
while [[ $subret -eq 0 ]]; do
subret=1
if [[ -e ${d}/configure ]]; then
ELT_walk_patches "${d}/configure" "${p}"
subret=$?
# ltmain.sh and co might be in a subdirectory ...
elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
ELT_walk_patches "${d}/../configure" "${p}"
subret=$?
fi
if [[ $subret -eq 0 ]]; then
# have at least one patch succeeded.
ret=0
fi
done
;;
mint-conf|gold-conf)
ret=1
local subret=1
if [[ -e ${d}/configure ]]; then
ELT_walk_patches "${d}/configure" "${p}"
subret=$?
# ltmain.sh and co might be in a subdirectory ...
elif [[ -e ${d}/../configure ]] ; then
ELT_walk_patches "${d}/../configure" "${p}"
subret=$?
elif [[ -e ${d}/../../configure ]] ; then
ELT_walk_patches "${d}/../../configure" "${p}"
subret=$?
fi
if [[ $subret -eq 0 ]]; then
# have at least one patch succeeded.
ret=0
fi
;;
install-sh)
ELT_walk_patches "${d}/install-sh" "${p}"
ret=$?
;;
cross)
if tc-is-cross-compiler ; then
ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
*)
ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
;;
esac
if [[ ${ret} -ne 0 ]] ; then
case ${p} in
relink)
local version=$(ELT_libtool_version "${d}/ltmain.sh")
# Critical patch, but could be applied ...
# FIXME: Still need a patch for ltmain.sh > 1.4.0
if ! grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" && \
[[ $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
ewarn " Could not apply relink.patch!"
fi
;;
portage)
# Critical patch - for this one we abort, as it can really
# cause breakage without it applied!
if [[ ${do_portage} == "yes" ]] ; then
# Stupid test to see if its already applied ...
if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
echo
eerror "Portage patch requested, but failed to apply!"
eerror "Please file a bug report to add a proper patch."
die "Portage patch requested, but failed to apply!"
fi
else
if grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
# ewarn " Portage patch seems to be already applied."
# ewarn " Please verify that it is not needed."
:
else
local version=$(ELT_libtool_version "${d}"/ltmain.sh)
echo
eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
eerror "Please file a bug report to add a proper patch."
die "Portage patch failed to apply!"
fi
# We do not want to run libtoolize ...
ELT_APPLIED_PATCHES="portage"
fi
;;
uclibc-*)
[[ ${CHOST} == *-uclibc ]] && ewarn " uClibc patch set '${p}' failed to apply!"
;;
fbsd-*)
if [[ ${CHOST} == *-freebsd* ]] ; then
if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
"${d}/configure" "${d}/../configure" 2>/dev/null) ]]; then
eerror " FreeBSD patch set '${p}' failed to apply!"
die "FreeBSD patch set '${p}' failed to apply!"
fi
fi
;;
darwin-*)
[[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!"
;;
esac
fi
done
if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
if [[ ${do_portage} == "no" && \
${do_reversedeps} == "no" && \
${do_only_patches} == "no" && \
${deptoremove} == "" ]]
then
ewarn "Cannot apply any patches, please file a bug about this"
die
fi
fi
rm -f "${d}/libtool"
> "${d}/.elibtoolized"
done
}
uclibctoolize() { die "Use elibtoolize"; }
darwintoolize() { die "Use elibtoolize"; }
# char *VER_major(string)
#
# Return the Major (X of X.Y.Z) version
#
VER_major() {
[[ -z $1 ]] && return 1
local VER=$@
echo "${VER%%[^[:digit:]]*}"
}
# char *VER_minor(string)
#
# Return the Minor (Y of X.Y.Z) version
#
VER_minor() {
[[ -z $1 ]] && return 1
local VER=$@
VER=${VER#*.}
echo "${VER%%[^[:digit:]]*}"
}
# char *VER_micro(string)
#
# Return the Micro (Z of X.Y.Z) version.
#
VER_micro() {
[[ -z $1 ]] && return 1
local VER=$@
VER=${VER#*.*.}
echo "${VER%%[^[:digit:]]*}"
}
# int VER_to_int(string)
#
# Convert a string type version (2.4.0) to an int (132096)
# for easy compairing or versions ...
#
VER_to_int() {
[[ -z $1 ]] && return 1
local VER_MAJOR=$(VER_major "$1")
local VER_MINOR=$(VER_minor "$1")
local VER_MICRO=$(VER_micro "$1")
local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
# We make version 1.0.0 the minimum version we will handle as
# a sanity check ... if its less, we fail ...
if [[ ${VER_int} -ge 65536 ]] ; then
echo "${VER_int}"
return 0
fi
echo 1
return 1
}
|