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

  ViewVC Help
Powered by ViewVC 1.1.20