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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.42  
changed lines
  Added in v.1.96

  ViewVC Help
Powered by ViewVC 1.1.20