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

  ViewVC Help
Powered by ViewVC 1.1.20